Module Name: src
Committed By: martin
Date: Sun Dec 26 12:06:57 UTC 2010
Modified Files:
src/sys/arch/sparc/include: types.h
src/sys/arch/sparc64/include: cpu.h
Log Message:
Move ci_data first in struct cpu_info
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/sparc/include/types.h
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/sparc64/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/include/types.h
diff -u src/sys/arch/sparc/include/types.h:1.54 src/sys/arch/sparc/include/types.h:1.55
--- src/sys/arch/sparc/include/types.h:1.54 Sun Dec 26 11:32:38 2010
+++ src/sys/arch/sparc/include/types.h Sun Dec 26 12:06:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.54 2010/12/26 11:32:38 martin Exp $ */
+/* $NetBSD: types.h,v 1.55 2010/12/26 12:06:56 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -116,9 +116,7 @@
#define __HAVE_DEVICE_REGISTER
#define __HAVE_SYSCALL_INTERN
#define __GENERIC_SOFT_INTERRUPTS_ALL_LEVELS
-#ifndef SUN4U
#define __HAVE_CPU_DATA_FIRST
-#endif
#ifdef SUN4U
#define __HAVE_DEVICE_REGISTER_POSTCONFIG
Index: src/sys/arch/sparc64/include/cpu.h
diff -u src/sys/arch/sparc64/include/cpu.h:1.92 src/sys/arch/sparc64/include/cpu.h:1.93
--- src/sys/arch/sparc64/include/cpu.h:1.92 Sat May 29 21:59:33 2010
+++ src/sys/arch/sparc64/include/cpu.h Sun Dec 26 12:06:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.92 2010/05/29 21:59:33 martin Exp $ */
+/* $NetBSD: cpu.h,v 1.93 2010/12/26 12:06:57 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -88,6 +88,8 @@
*/
struct cpu_info {
+ struct cpu_data ci_data; /* MI per-cpu data */
+
/*
* SPARC cpu_info structures live at two VAs: one global
@@ -167,8 +169,6 @@
pte_t *ci_tsb_dmmu;
pte_t *ci_tsb_immu;
- struct cpu_data ci_data; /* MI per-cpu data */
-
volatile void *ci_ddb_regs; /* DDB regs */
};
