lkml.org 
[lkml]   [2008]   [Dec]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Date
Subject[PATCH 1/6] cpumask: make CONFIG_NR_CPUS always valid.
Impact: cleanup

Currently we have NR_CPUS, which is 1 on UP, and CONFIG_NR_CPUS on
SMP. If we make CONFIG_NR_CPUS always valid (and always 1 on !SMP),
we can skip the middleman.

This also allows us to find and check all the remaining NR_CPUS users.

To avoid breaking every arch, we cheat and do this for the moment
in the header if the arch doesn't.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Mike Travis <travis@sgi.com>
---
include/linux/threads.h | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

diff -r 329e9ec99074 include/linux/threads.h
--- a/include/linux/threads.h Thu Oct 23 23:46:33 2008 +1100
+++ b/include/linux/threads.h Thu Oct 23 23:50:50 2008 +1100
@@ -8,16 +8,16 @@
*/

/*
- * 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
+#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
-#else
-#define NR_CPUS 1
-#endif

#define MIN_THREADS_LEFT_FOR_ROOT 4




\
 
 \ /
  Last update: 2008-12-01 09:19    [W:0.638 / U:0.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site