From 04237c005b89bc5fc7cfb038fe6c2db0923950c2 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 30 Dec 2008 09:05:12 +1030
Subject: [PATCH] --- yaml --- r: 125663 b: refs/heads/master c:
 278d1ed65e25d80af7c3a112d707b3f70516ddb4 h: refs/heads/master i:   125661:
 76d223ae68fb0e5dfb3a067d304f34ccf42a0d20   125659:
 976891359518b87b8b4d92761dc9eeb062fd9151   125655:
 8c841e3513ce64624250d535b0d497e777fd7599   125647:
 22b626fbf73b73cd8128f36b1083722b5695d1a6   125631:
 90871cd73a3e7175c589a2e685b1382e0ae91974 v: v3

---
 [refs]                        |  2 +-
 trunk/include/linux/threads.h | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 21f351c88e27..749f4b0c0921 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33edcf133ba93ecba2e4b6472e97b689895d805c
+refs/heads/master: 278d1ed65e25d80af7c3a112d707b3f70516ddb4
diff --git a/trunk/include/linux/threads.h b/trunk/include/linux/threads.h
index 38d1a5d6568e..052b12bec8bd 100644
--- a/trunk/include/linux/threads.h
+++ b/trunk/include/linux/threads.h
@@ -8,17 +8,17 @@
  */
 
 /*
- * Maximum supported processors that can run under SMP.  This value is
- * set via configure setting.  The maximum is equal to the size of the
- * bitmasks used on that platform, i.e. 32 or 64.  Setting this smaller
- * saves quite a bit of memory.
+ * Maximum supported processors.  Setting this smaller saves quite a
+ * bit of memory.  Use nr_cpu_ids instead of this except for static bitmaps.
  */
-#ifdef CONFIG_SMP
-#define NR_CPUS		CONFIG_NR_CPUS
-#else
-#define NR_CPUS		1
+#ifndef CONFIG_NR_CPUS
+/* FIXME: This should be fixed in the arch's Kconfig */
+#define CONFIG_NR_CPUS	1
 #endif
 
+/* Places which use this should consider cpumask_var_t. */
+#define NR_CPUS		CONFIG_NR_CPUS
+
 #define MIN_THREADS_LEFT_FOR_ROOT 4
 
 /*