[src/trunk]: src/sys/arch Move ci_data first in struct cpu_info

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e580db904ecd
branches:  trunk
changeset: 760090:e580db904ecd
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Dec 26 12:06:56 2010 +0000

description:
Move ci_data first in struct cpu_info

diffstat:

 sys/arch/sparc/include/types.h |  4 +---
 sys/arch/sparc64/include/cpu.h |  6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r 68cc459dac2a -r e580db904ecd sys/arch/sparc/include/types.h
--- a/sys/arch/sparc/include/types.h    Sun Dec 26 11:32:38 2010 +0000
+++ b/sys/arch/sparc/include/types.h    Sun Dec 26 12:06:56 2010 +0000
@@ -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
diff -r 68cc459dac2a -r e580db904ecd sys/arch/sparc64/include/cpu.h
--- a/sys/arch/sparc64/include/cpu.h    Sun Dec 26 11:32:38 2010 +0000
+++ b/sys/arch/sparc64/include/cpu.h    Sun Dec 26 12:06:56 2010 +0000
@@ -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 */
 };