Index: linux-2.6.17-rc6-mm2/mm/page_alloc.c
===================================================================
--- linux-2.6.17-rc6-mm2.orig/mm/page_alloc.c	2006-06-10 11:34:22.213840263 -0700
+++ linux-2.6.17-rc6-mm2/mm/page_alloc.c	2006-06-10 11:34:37.985322553 -0700
@@ -2866,7 +2866,6 @@ struct seq_operations vmstat_op = {
 
 #endif /* CONFIG_PROC_FS */
 
-#ifdef CONFIG_HOTPLUG_CPU
 /*
  * Fold the foreign cpu states int our own.
  *
@@ -2886,6 +2885,7 @@ static void vm_events_fold_cpu(int cpu)
 	}
 }
 
+#ifdef CONFIG_HOTPLUG_CPU
 static int page_alloc_cpu_notify(struct notifier_block *self,
 				 unsigned long action, void *hcpu)
 {