aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/smpboot.c
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-09-26 04:52:32 -0400
committerAndi Kleen <andi@basil.nowhere.org>2006-09-26 04:52:32 -0400
commit2c8c0e6b8d7700a990da8d24eff767f9ca223b96 (patch)
treeb5477ee2558efff235c483d1619ce892db479d18 /arch/x86_64/kernel/smpboot.c
parent1a3f239ddf9208f2e52d36fef1c1c4518cbbbabe (diff)
[PATCH] Convert x86-64 to early param
Instead of hackish manual parsing Requires earlier i386 patchkit, but also fixes i386 early_printk again. I removed some obsolete really early parameters which didn't do anything useful. Also made a few parameters that needed it early (mostly oops printing setup) Also removed one panic check that wasn't visible without early console anyways (the early console is now initialized after that panic) This cleans up a lot of code. Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64/kernel/smpboot.c')
-rw-r--r--arch/x86_64/kernel/smpboot.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c
index ae7d6d84e352..0b9f28b05e7d 100644
--- a/arch/x86_64/kernel/smpboot.c
+++ b/arch/x86_64/kernel/smpboot.c
@@ -1270,11 +1270,11 @@ void __cpu_die(unsigned int cpu)
1270 printk(KERN_ERR "CPU %u didn't die...\n", cpu); 1270 printk(KERN_ERR "CPU %u didn't die...\n", cpu);
1271} 1271}
1272 1272
1273__init int setup_additional_cpus(char *s) 1273static __init int setup_additional_cpus(char *s)
1274{ 1274{
1275 return get_option(&s, &additional_cpus); 1275 return s && get_option(&s, &additional_cpus) ? 0 : -EINVAL;
1276} 1276}
1277__setup("additional_cpus=", setup_additional_cpus); 1277early_param("additional_cpus", setup_additional_cpus);
1278 1278
1279#else /* ... !CONFIG_HOTPLUG_CPU */ 1279#else /* ... !CONFIG_HOTPLUG_CPU */
1280 1280