This patch disables the generic setup if __ARCH_HAS_VM_PERCPU defined. Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx> Index: linux-2.6.16-test/init/main.c =================================================================== --- linux-2.6.16-test.orig/init/main.c 2006-05-17 04:32:28.000000000 -0400 +++ linux-2.6.16-test/init/main.c 2006-05-17 04:57:45.000000000 -0400 @@ -324,7 +324,7 @@ static inline void smp_prepare_cpus(unsi #else -#ifdef __GENERIC_PER_CPU +#if defined(__GENERIC_PER_CPU) && !defined(__ARCH_HAS_VM_PERCPU) unsigned long __per_cpu_offset[NR_CPUS]; EXPORT_SYMBOL(__per_cpu_offset);