---
 arch/x86/Kconfig                 |    5 +++++
 arch/x86/kernel/setup64.c        |    4 ++--
 arch/x86/kernel/vmlinux_64.lds.S |    1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

Index: linux-2.6/arch/x86/kernel/setup64.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/setup64.c	2007-11-27 19:47:01.664213132 -0800
+++ linux-2.6/arch/x86/kernel/setup64.c	2007-11-27 19:47:52.472463458 -0800
@@ -111,8 +111,8 @@ void __init setup_per_cpu_areas(void)
 		}
 		if (!ptr)
 			panic("Cannot allocate cpu data for CPU %d\n", i);
-		cpu_pda(i)->data_offset = ptr - __per_cpu_start;
-		memcpy(ptr, __per_cpu_start, __per_cpu_end - __per_cpu_start);
+		cpu_pda(i)->data_offset = (unsigned long)ptr;
+		memcpy(ptr, __per_cpu_load, __per_cpu_size);
 		/* Relocate the pda */
 		memcpy(&per_cpu(pda, i), cpu_pda(i), sizeof(struct x8664_pda));
 		cpu_pda(i) = &per_cpu(pda, i);
Index: linux-2.6/arch/x86/kernel/vmlinux_64.lds.S
===================================================================
--- linux-2.6.orig/arch/x86/kernel/vmlinux_64.lds.S	2007-11-27 19:47:01.676213037 -0800
+++ linux-2.6/arch/x86/kernel/vmlinux_64.lds.S	2007-11-27 19:47:52.472463458 -0800
@@ -16,6 +16,7 @@ jiffies_64 = jiffies;
 _proxy_pda = 1;
 PHDRS {
 	text PT_LOAD FLAGS(5);	/* R_E */
+	percpu PT_LOAD FLAGS(4);	/* R__ */
 	data PT_LOAD FLAGS(7);	/* RWE */
 	user PT_LOAD FLAGS(7);	/* RWE */
 	data.init PT_LOAD FLAGS(7);	/* RWE */
Index: linux-2.6/arch/x86/Kconfig
===================================================================
--- linux-2.6.orig/arch/x86/Kconfig	2007-11-27 19:47:01.688213135 -0800
+++ linux-2.6/arch/x86/Kconfig	2007-11-27 19:48:34.900212634 -0800
@@ -115,6 +115,11 @@ config GENERIC_TIME_VSYSCALL
 config ARCH_SETS_UP_PER_CPU_AREA
 	def_bool X86_64
 
+config PERCPU_ZERO_BASED
+	bool
+	depends on X86_64 && SMP
+	default y
+
 config ZONE_DMA32
 	bool
 	default X86_64