Module Name: src
Committed By: christos
Date: Wed Dec 22 04:15:02 UTC 2010
Modified Files:
src/sys/arch/amd64/include: types.h
src/sys/arch/i386/include: types.h
src/sys/arch/x86/include: cpu.h
Log Message:
Make __HAVE_CPU_DATA_FIRST true
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/amd64/include/types.h
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/i386/include/types.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/x86/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/amd64/include/types.h
diff -u src/sys/arch/amd64/include/types.h:1.33 src/sys/arch/amd64/include/types.h:1.34
--- src/sys/arch/amd64/include/types.h:1.33 Fri Dec 11 00:52:03 2009
+++ src/sys/arch/amd64/include/types.h Tue Dec 21 23:15:02 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.33 2009/12/11 05:52:03 matt Exp $ */
+/* $NetBSD: types.h,v 1.34 2010/12/22 04:15:02 christos Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -78,6 +78,7 @@
#define __HAVE_DEVICE_REGISTER
#define __HAVE_CPU_COUNTER
+#define __HAVE_CPU_INFO_FIRST
#define __HAVE_MD_CPU_OFFLINE
#define __HAVE_SYSCALL_INTERN
#define __HAVE_MINIMAL_EMUL
Index: src/sys/arch/i386/include/types.h
diff -u src/sys/arch/i386/include/types.h:1.69 src/sys/arch/i386/include/types.h:1.70
--- src/sys/arch/i386/include/types.h:1.69 Tue Dec 14 10:50:07 2010
+++ src/sys/arch/i386/include/types.h Tue Dec 21 23:15:02 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.69 2010/12/14 15:50:07 haad Exp $ */
+/* $NetBSD: types.h,v 1.70 2010/12/22 04:15:02 christos Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -102,6 +102,7 @@
#define __NO_STRICT_ALIGNMENT
#define __HAVE_DEVICE_REGISTER
+#define __HAVE_CPU_DATA_FIRST
#define __HAVE_CPU_COUNTER
#define __HAVE_MD_CPU_OFFLINE
#define __HAVE_SYSCALL_INTERN
Index: src/sys/arch/x86/include/cpu.h
diff -u src/sys/arch/x86/include/cpu.h:1.25 src/sys/arch/x86/include/cpu.h:1.26
--- src/sys/arch/x86/include/cpu.h:1.25 Mon Aug 16 15:39:06 2010
+++ src/sys/arch/x86/include/cpu.h Tue Dec 21 23:15:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.25 2010/08/16 19:39:06 jym Exp $ */
+/* $NetBSD: cpu.h,v 1.26 2010/12/22 04:15:01 christos Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -78,6 +78,7 @@
*/
struct cpu_info {
+ struct cpu_data ci_data; /* MI per-cpu data */
device_t ci_dev; /* pointer to our device */
struct cpu_info *ci_self; /* self-pointer */
volatile struct vcpu_info *ci_vcpu; /* for XEN */
@@ -97,7 +98,6 @@
int ci_cpumask; /* (1 << CPU ID) */
uint32_t ci_acpiid; /* our ACPI/MADT ID */
uint32_t ci_initapicid; /* our intitial APIC ID */
- struct cpu_data ci_data; /* MI per-cpu data */
/*
* Private members.
