---
 include/linux/percpu.h |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

Index: linux-2.6/include/linux/percpu.h
===================================================================
--- linux-2.6.orig/include/linux/percpu.h	2007-12-01 21:19:13.000000000 -0800
+++ linux-2.6/include/linux/percpu.h	2007-12-01 22:52:40.000000000 -0800
@@ -11,11 +11,8 @@
 
 /* Enough to cover all DEFINE_PER_CPUs in kernel, including modules. */
 #ifndef PERCPU_ENOUGH_ROOM
-#ifdef CONFIG_MODULES
-#define PERCPU_MODULE_RESERVE	8192
-#else
-#define PERCPU_MODULE_RESERVE	0
-#endif
+#define PERCPU_MODULE_RESERVE (10000 * (sizeof(unsigned long) + \
+							2 * NUMA_BUILD))
 
 #define PERCPU_ENOUGH_ROOM						\
 	(__per_cpu_end - __per_cpu_start + PERCPU_MODULE_RESERVE)