tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

[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>

authored by

Andi Kleen and committed by
Linus Torvalds e2c03888 2eb1bdba

+8 -1
+6
arch/x86_64/kernel/setup.c
··· 423 423 else if(!memcmp(from, "elfcorehdr=", 11)) 424 424 elfcorehdr_addr = memparse(from+11, &from); 425 425 #endif 426 + 427 + #ifdef CONFIG_SMP 428 + else if (!memcmp(from, "additional_cpus=", 16)) 429 + setup_additional_cpus(from+16); 430 + #endif 431 + 426 432 next_char: 427 433 c = *(from++); 428 434 if (!c)
+1 -1
arch/x86_64/kernel/smpboot.c
··· 1244 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 1249 return get_option(&s, &additional_cpus); 1250 1250 }
+1
include/asm-x86_64/proto.h
··· 134 134 135 135 extern int reboot_force; 136 136 extern int notsc_setup(char *); 137 + extern int setup_additional_cpus(char *); 137 138 138 139 extern void smp_local_timer_interrupt(struct pt_regs * regs); 139 140