Merge tag 'clk-for-linus-3.13' of git://git.linaro.org/people/mturquette/linux

[cascardo/linux.git] / arch / parisc / kernel / setup.c

diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c
index 7349a3f..72a3c65 100644 (file)
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -318,8 +318,12 @@ static int __init parisc_init(void)
        pdc_stable_write(0x40, &osid, sizeof(osid));
        
        processor_init();
-       printk(KERN_INFO "CPU(s): %d x %s at %d.%06d MHz\n",
-                       num_present_cpus(),
+#ifdef CONFIG_SMP
+       pr_info("CPU(s): %d out of %d %s at %d.%06d MHz online\n",
+               num_online_cpus(), num_present_cpus(),
+#else
+       pr_info("CPU(s): 1 x %s at %d.%06d MHz\n",
+#endif
                        boot_cpu_data.cpu_name,
                        boot_cpu_data.cpu_hz / 1000000,
                        boot_cpu_data.cpu_hz % 1000000  );