x86: enable cpus display of kernel_max and offlined cpus

Impact: enables /sys/devices/system/cpu/{kernel_max,offline} user interface

By setting total_cpus, the drivers/base/cpu.c will display the
values of kernel_max (NR_CPUS-1) and the offlined cpu map.

Signed-off-by: Mike Travis <travis@sgi.com>
Acked-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 9e177a4077eee50a45412ef6ff3c89f31d385c11..f49c26bd7e2da7d0981b3029241701ca083362e7 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1298,6 +1298,8 @@ __init void prefill_possible_map(void)
        else
                possible = setup_possible_cpus;
 
+       total_cpus = max_t(int, possible, num_processors + disabled_cpus);
+
        if (possible > CONFIG_NR_CPUS) {
                printk(KERN_WARNING
                        "%d Processors exceeds NR_CPUS limit of %d\n",