2 files changed, 2 insertions, 20 deletions

diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index eaf508ccc284..d912e0c282a2 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -26,6 +26,7 @@
  */
 
 #include "opt_cpu.h"
+#include "opt_upages.h"
 
 #ifdef SMP
 #include <machine/smptests.h>
@@ -70,6 +71,7 @@
 #include <machine/tss.h>
 #include <machine/specialreg.h>
 #include <machine/globaldata.h>
+#include <machine/privatespace.h>
 
 #if defined(APIC_IO)
 #include <machine/md_var.h>		/* setidt() */
diff --git a/sys/amd64/include/pcpu.h b/sys/amd64/include/pcpu.h
index cda7b1e172e2..37388aa69349 100644
--- a/sys/amd64/include/pcpu.h
+++ b/sys/amd64/include/pcpu.h
@@ -74,26 +74,6 @@ struct globaldata {
 #endif
 };
 
-#ifdef SMP
-/*
- * This is the upper (0xff800000) address space layout that is per-cpu.
- * It is setup in locore.s and pmap.c for the BSP and in mp_machdep.c for
- * each AP.  genassym helps export this to the assembler code.
- */
-struct privatespace {
-	/* page 0 - data page */
-	struct	globaldata globaldata;
-	char	__filler0[PAGE_SIZE - sizeof(struct globaldata)];
-
-	/* page 1 - idle stack (UPAGES pages) */
-	char	idlestack[UPAGES * PAGE_SIZE];
-	/* page 1+UPAGES... */
-};
-
-extern struct privatespace SMP_prvspace[];
-
-#endif
-
 #endif	/* _KERNEL */
 
 #endif	/* ! _MACHINE_GLOBALDATA_H_ */