[src/trunk]: src/sys/arch/sparc/include PR port-sparc/55261: sparc still pani...

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

details:   https://anonhg.NetBSD.org/src/rev/dee849f7cbf3
branches:  trunk
changeset: 932804:dee849f7cbf3
user:      ad <ad%NetBSD.org@localhost>
date:      Sat May 16 17:52:42 2020 +0000

description:
PR port-sparc/55261: sparc still panics running ATF tests

Reinstate the cpu_info change and remove __HAVE_CPU_DATA_FIRST to fix
build failure.

diffstat:

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

diffs (44 lines):

diff -r 0a5e6727670f -r dee849f7cbf3 sys/arch/sparc/include/cpu.h
--- a/sys/arch/sparc/include/cpu.h      Sat May 16 17:42:06 2020 +0000
+++ b/sys/arch/sparc/include/cpu.h      Sat May 16 17:52:42 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.107 2020/05/16 17:37:28 ad Exp $ */
+/*     $NetBSD: cpu.h,v 1.108 2020/05/16 17:52:42 ad Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -175,8 +175,6 @@
  */
 
 struct cpu_info {
-       struct cpu_data ci_data;        /* MI per-cpu data */
-
        /*
         * Primary Inter-processor message area.  Keep this aligned
         * to a cache line boundary if possible, as the structure
@@ -395,6 +393,8 @@
        struct evcnt ci_xpmsg_bogus;
        struct evcnt ci_intrcnt[16];
        struct evcnt ci_sintrcnt[16];
+
+       struct cpu_data ci_data;        /* MI per-cpu data */
 };
 
 #endif /* _KERNEL || _KMEMUSER */
diff -r 0a5e6727670f -r dee849f7cbf3 sys/arch/sparc/include/types.h
--- a/sys/arch/sparc/include/types.h    Sat May 16 17:42:06 2020 +0000
+++ b/sys/arch/sparc/include/types.h    Sat May 16 17:52:42 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: types.h,v 1.66 2016/01/23 22:31:20 christos Exp $ */
+/*     $NetBSD: types.h,v 1.67 2020/05/16 17:52:42 ad Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -123,7 +123,6 @@
 #define        __HAVE_NEW_STYLE_BUS_H
 #define        __HAVE_SYSCALL_INTERN
 #define        __GENERIC_SOFT_INTERRUPTS_ALL_LEVELS
-#define __HAVE_CPU_DATA_FIRST
 #define        __HAVE_CPU_VMSPACE_EXEC
 #define        __HAVE_RAS