Module Name: src
Committed By: ad
Date: Sat May 16 17:52:42 UTC 2020
Modified Files:
src/sys/arch/sparc/include: cpu.h types.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/sparc/include/cpu.h
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/sparc/include/types.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/cpu.h
diff -u src/sys/arch/sparc/include/cpu.h:1.107 src/sys/arch/sparc/include/cpu.h:1.108
--- src/sys/arch/sparc/include/cpu.h:1.107 Sat May 16 17:37:28 2020
+++ src/sys/arch/sparc/include/cpu.h Sat May 16 17:52:42 2020
@@ -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 xpmsg {
*/
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 cpu_info {
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 */
Index: src/sys/arch/sparc/include/types.h
diff -u src/sys/arch/sparc/include/types.h:1.66 src/sys/arch/sparc/include/types.h:1.67
--- src/sys/arch/sparc/include/types.h:1.66 Sat Jan 23 22:31:20 2016
+++ src/sys/arch/sparc/include/types.h Sat May 16 17:52:42 2020
@@ -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 @@ typedef unsigned long int __register_t;
#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
