--- cpumask.h	14 Sep 2009 23:14:14 -0000	1.1.1.1
+++ cpumask.h	17 Sep 2009 16:55:09 -0000
@@ -396,7 +396,9 @@
 
 #if NR_CPUS == 1
 
-#define nr_cpu_ids		1
+/*  See init/main.c:368  */
+extern int nr_cpu_ids;
+
 #ifndef CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
 #define first_cpu(src)		({ (void)(src); 0; })
 #define next_cpu(n, src)	({ (void)(src); 1; })
@@ -406,7 +408,6 @@
 #endif /* !CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS */
 #else /* NR_CPUS > 1 */
 
-extern int nr_cpu_ids;
 #ifndef CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
 int __first_cpu(const cpumask_t *srcp);
 int __next_cpu(int n, const cpumask_t *srcp);