summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-11-05 08:00:51 +0100
committerIngo Molnar <mingo@kernel.org>2013-11-05 08:00:51 +0100
commit62177c5aba261c92dfd1d00adaeebcfe19cf0ff5 (patch)
tree6c2fd70963282725533205fc80611d9e58eaa5ef /kernel
parentf20d0804d24884291e5bcd76330627be02549d56 (diff)
parenta17bce4d1dce8f3cf714bc2e5d8e4bac009dc077 (diff)
Merge branch 'x86/boot'
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)
nr_cpu_ids = find_last_bit(cpumask_bits(cpu_possible_mask),NR_CPUS) + 1;
}
+void __weak smp_announce(void)
+{
+ printk(KERN_INFO "Brought up %d CPUs\n", num_online_cpus());
+}
+
/* Called by boot processor to activate the rest. */
void __init smp_init(void)
{
@@ -540,7 +545,7 @@ void __init smp_init(void)
}
/* Any cleanup work */
- printk(KERN_INFO "Brought up %ld CPUs\n", (long)num_online_cpus());
+ smp_announce();
smp_cpus_done(setup_max_cpus);
}