diff options
| author | Helge Deller <deller@gmx.de> | 2013-10-24 21:45:42 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2013-11-07 22:29:05 +0100 |
| commit | 3a7452b4449d34f2eec377e45036f5e0808aff09 (patch) | |
| tree | 3c8113e926230b3eabdcd6ca1ab8424a9db73267 /arch/parisc/kernel | |
| parent | 6f0c4aa61d30131ceb32f2a9926dd71cc5cd003a (diff) | |
| download | linux-3a7452b4449d34f2eec377e45036f5e0808aff09.tar.gz linux-3a7452b4449d34f2eec377e45036f5e0808aff09.tar.bz2 linux-3a7452b4449d34f2eec377e45036f5e0808aff09.zip | |
parisc: correctly display number of active CPUs
In case we fail to power up other CPUs in a SMP system, the kernel
currently shows a wrong number of online CPUs. This change makes the
output more verbose on how many of the CPUs are online. Example:
CPU(s): 1 out of 2 PA8800 (Mako) at 900.000000 MHz online.
Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'arch/parisc/kernel')
| -rw-r--r-- | arch/parisc/kernel/setup.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c index 7349a3fedfc7..72a3c658ad7b 100644 --- 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 ); |