diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-02-22 16:25:18 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-22 16:25:18 -0800 |
| commit | 54b56170e4517e9606b245c3f805fc96baa059f0 (patch) | |
| tree | 9f8750ef972b4a7fdce530889dcbaf2a8b5b0d05 /arch/ia64/kernel/acpi.c | |
| parent | 1f91233c26fd5f7d6525fd29b95e4b50ca7a3e88 (diff) | |
| parent | d02e30c31c57683a66ed68a1bcff900ca78f6d56 (diff) | |
Merge remote branch 'origin/x86/apic' into x86/mrst
Conflicts:
arch/x86/kernel/apic/io_apic.c
Diffstat (limited to 'arch/ia64/kernel/acpi.c')
| -rw-r--r-- | arch/ia64/kernel/acpi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 40574ae11401..605a08b29721 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c @@ -881,8 +881,8 @@ __init void prefill_possible_map(void) possible = available_cpus + additional_cpus; - if (possible > NR_CPUS) - possible = NR_CPUS; + if (possible > nr_cpu_ids) + possible = nr_cpu_ids; printk(KERN_INFO "SMP: Allowing %d CPUs, %d hotplug CPUs\n", possible, max((possible - available_cpus), 0)); |