diff --git a/[refs] b/[refs] index 79a90d4f768a..a73ef9ad4973 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbe55f4797712f86691a0ee0b5f508693c7310fe +refs/heads/master: c5562faeaacf19e81a78ee37cc6b96ab1f3e68e4 diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c index b78e4d47a42b..6b087ab6cd8f 100644 --- a/trunk/arch/x86/kernel/smpboot.c +++ b/trunk/arch/x86/kernel/smpboot.c @@ -1306,7 +1306,7 @@ static void remove_siblinginfo(int cpu) cpu_clear(cpu, cpu_sibling_setup_map); } -int additional_cpus __initdata = -1; +static int additional_cpus __initdata = -1; static __init int setup_additional_cpus(char *s) {