* [PATCH] init/main.c: refactor maxcpus()
@ 2010-08-15 9:35 Namhyung Kim
0 siblings, 0 replies; only message in thread
From: Namhyung Kim @ 2010-08-15 9:35 UTC (permalink / raw)
To: Ingo Molnar, Andrew Morton; +Cc: linux-kernel
get_option() requires 2nd arg to be a pointer to int but setup_max_cpus is a
pointer to unsigned int. Use max_cpus instead and update setup_max_cpus only
if given value is in the proper range.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
---
init/main.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/init/main.c b/init/main.c
index 86cbfd0..b06b8f2 100644
--- a/init/main.c
+++ b/init/main.c
@@ -165,9 +165,13 @@ early_param("nr_cpus", nrcpus);
static int __init maxcpus(char *str)
{
- get_option(&str, &setup_max_cpus);
- if (setup_max_cpus == 0)
- arch_disable_smp_support();
+ int max_cpus;
+
+ get_option(&str, &max_cpus);
+ if (max_cpus == 0)
+ nosmp(NULL);
+ else if (0 < max_cpus && max_cpus < NR_CPUS)
+ setup_max_cpus = max_cpus;
return 0;
}
--
1.7.0.4
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-08-15 16:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-15 9:35 [PATCH] init/main.c: refactor maxcpus() Namhyung Kim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®