diff options
author | Andi Kleen <ak@suse.de> | 2006-02-25 22:18:46 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-26 12:53:30 -0500 |
commit | e2c0388866dc12bef56b178b958f9b778fe6c687 (patch) | |
tree | 8a029b1e859215340fd7a029194bffdd7661e4c8 /arch/x86_64/kernel/smpboot.c | |
parent | 2eb1bdbad89b19c99f8ac1de1492cdabbff6b3d3 (diff) |
[PATCH] x86_64: Fix the additional_cpus=.. option
It didn't set up the CPU possible map early enough, so the
option didn't actually work.
Noticed by Heiko Carstens
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64/kernel/smpboot.c')
-rw-r--r-- | arch/x86_64/kernel/smpboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c index 67e4e28f4df8..b82eb86e4f5d 100644 --- a/arch/x86_64/kernel/smpboot.c +++ b/arch/x86_64/kernel/smpboot.c | |||
@@ -1244,7 +1244,7 @@ void __cpu_die(unsigned int cpu) | |||
1244 | printk(KERN_ERR "CPU %u didn't die...\n", cpu); | 1244 | printk(KERN_ERR "CPU %u didn't die...\n", cpu); |
1245 | } | 1245 | } |
1246 | 1246 | ||
1247 | static __init int setup_additional_cpus(char *s) | 1247 | __init int setup_additional_cpus(char *s) |
1248 | { | 1248 | { |
1249 | return get_option(&s, &additional_cpus); | 1249 | return get_option(&s, &additional_cpus); |
1250 | } | 1250 | } |