- Split out the support for per-CPU data from the SMP code. UP kernels

  have per-CPU data and gdb on the i386 at least needs access to it.
- Clean up includes in kern_idle.c and subr_smp.c.

Reviewed by:	jake

3 files changed, 3 insertions, 3 deletions

diff --git a/sys/alpha/alpha/db_interface.c b/sys/alpha/alpha/db_interface.c
index b4cc5dc..d37c6b8 100644
--- a/sys/alpha/alpha/db_interface.c
+++ b/sys/alpha/alpha/db_interface.c
@@ -60,6 +60,7 @@
 #include <sys/cons.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
+#include <sys/pcpu.h>
 #include <sys/smp.h>
 
 #include <vm/vm.h>
diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c
index 177fe8e..2ea7df6 100644
--- a/sys/alpha/alpha/machdep.c
+++ b/sys/alpha/alpha/machdep.c
@@ -103,6 +103,7 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/lock.h>
+#include <sys/pcpu.h>
 #include <sys/malloc.h>
 #include <sys/reboot.h>
 #include <sys/bio.h>
@@ -131,7 +132,6 @@
 #include <machine/reg.h>
 #include <machine/fpu.h>
 #include <machine/pal.h>
-#include <machine/globaldata.h>
 #include <machine/cpuconf.h>
 #include <machine/bootinfo.h>
 #include <machine/rpb.h>
@@ -2241,7 +2241,5 @@ globaldata_init(struct globaldata *globaldata, int cpuid, size_t sz)
 	globaldata->gd_cpuid = cpuid;
 	globaldata->gd_next_asn = 0;
 	globaldata->gd_current_asngen = 1;
-#ifdef SMP
 	globaldata_register(globaldata);
-#endif
 }
diff --git a/sys/alpha/alpha/mp_machdep.c b/sys/alpha/alpha/mp_machdep.c
index 3024102..ece7fe4 100644
--- a/sys/alpha/alpha/mp_machdep.c
+++ b/sys/alpha/alpha/mp_machdep.c
@@ -35,6 +35,7 @@
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/kernel.h>
+#include <sys/pcpu.h>
 #include <sys/smp.h>
 #include <sys/sysctl.h>