aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-11 20:41:10 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-11 20:41:10 -0500
commit014d595c23f33dd8e2a996cc62239fb279047f1b (patch)
tree2bd1ef0341423de2cd312de7407dd9afb59c4e49 /kernel
parentae795fe760e20a7c6ad0f2cd24fc31afad73f427 (diff)
parenta17bce4d1dce8f3cf714bc2e5d8e4bac009dc077 (diff)
Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 boot changes from Ingo Molnar: "Two changes that prettify and compactify the SMP bootup output from: smpboot: Booting Node 0, Processors #1 #2 #3 OK smpboot: Booting Node 1, Processors #4 #5 #6 #7 OK smpboot: Booting Node 2, Processors #8 #9 #10 #11 OK smpboot: Booting Node 3, Processors #12 #13 #14 #15 OK Brought up 16 CPUs to something like: x86: Booting SMP configuration: .... node #0, CPUs: #1 #2 #3 .... node #1, CPUs: #4 #5 #6 #7 .... node #2, CPUs: #8 #9 #10 #11 .... node #3, CPUs: #12 #13 #14 #15 x86: Booted up 4 nodes, 16 CPUs" * 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/boot: Further compress CPUs bootup message x86: Improve the printout of the SMP bootup CPU table
Diffstat (limited to 'kernel')
-rw-r--r--kernel/smp.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/smp.c b/kernel/smp.c
index 0564571dcdf7..f5768b0c816a 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -524,6 +524,11 @@ void __init setup_nr_cpu_ids(void)
524 nr_cpu_ids = find_last_bit(cpumask_bits(cpu_possible_mask),NR_CPUS) + 1; 524 nr_cpu_ids = find_last_bit(cpumask_bits(cpu_possible_mask),NR_CPUS) + 1;
525} 525}
526 526
527void __weak smp_announce(void)
528{
529 printk(KERN_INFO "Brought up %d CPUs\n", num_online_cpus());
530}
531
527/* Called by boot processor to activate the rest. */ 532/* Called by boot processor to activate the rest. */
528void __init smp_init(void) 533void __init smp_init(void)
529{ 534{
@@ -540,7 +545,7 @@ void __init smp_init(void)
540 } 545 }
541 546
542 /* Any cleanup work */ 547 /* Any cleanup work */
543 printk(KERN_INFO "Brought up %ld CPUs\n", (long)num_online_cpus()); 548 smp_announce();
544 smp_cpus_done(setup_max_cpus); 549 smp_cpus_done(setup_max_cpus);
545} 550}
546 551