Module Name: src
Committed By: ad
Date: Sat May 16 17:37:28 UTC 2020
Modified Files:
src/sys/arch/sparc/include: cpu.h
Log Message:
Back out previous - it doesn't work.
To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/sparc/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/cpu.h
diff -u src/sys/arch/sparc/include/cpu.h:1.106 src/sys/arch/sparc/include/cpu.h:1.107
--- src/sys/arch/sparc/include/cpu.h:1.106 Fri May 15 18:45:08 2020
+++ src/sys/arch/sparc/include/cpu.h Sat May 16 17:37:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.106 2020/05/15 18:45:08 ad Exp $ */
+/* $NetBSD: cpu.h,v 1.107 2020/05/16 17:37:28 ad Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -175,6 +175,8 @@ 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
@@ -393,8 +395,6 @@ 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 */
