Merge tag 'trace-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[karo-tx-linux.git] / kernel / smp.c

diff --git a/kernel/smp.c b/kernel/smp.c
index bba3b201668df7cac3e393564187f74293e71722..77fcdb9f27756f7a73d4b87afed0ad28f0e56359 100644 (file)
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -3,6 +3,9 @@
  *
  * (C) Jens Axboe <jens.axboe@oracle.com> 2008
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/irq_work.h>
 #include <linux/rcupdate.h>
 #include <linux/rculist.h>
@@ -543,19 +546,17 @@ 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)
 {
+       int num_nodes, num_cpus;
        unsigned int cpu;
 
        idle_threads_init();
        cpuhp_threads_init();
 
+       pr_info("Bringing up secondary CPUs ...\n");
+
        /* FIXME: This should be done in userspace --RR */
        for_each_present_cpu(cpu) {
                if (num_online_cpus() >= setup_max_cpus)
@@ -564,8 +565,13 @@ void __init smp_init(void)
                        cpu_up(cpu);
        }
 
+       num_nodes = num_online_nodes();
+       num_cpus  = num_online_cpus();
+       pr_info("Brought up %d node%s, %d CPU%s\n",
+               num_nodes, (num_nodes > 1 ? "s" : ""),
+               num_cpus,  (num_cpus  > 1 ? "s" : ""));
+
        /* Any cleanup work */
-       smp_announce();
        smp_cpus_done(setup_max_cpus);
 }