diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-06 10:51:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-06 10:51:36 -0800 |
| commit | 017892c341033b3e961e695bc0bf1a815efcf92e (patch) | |
| tree | d7499f5f95d938005ce047c4eac44deb56838d48 /arch/x86/platform/sfi/sfi.c | |
| parent | 42cbd8efb0746b55112de45173219f76c54390da (diff) | |
| parent | cb2ded37fd2e1039f96c8c892da024a8f033add5 (diff) | |
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Fix APIC ID sizing bug on larger systems, clean up MAX_APICS confusion
x86, acpi: Parse all SRAT cpu entries even above the cpu number limitation
x86, acpi: Add MAX_LOCAL_APIC for 32bit
x86: io_apic: Split setup_ioapic_ids_from_mpc()
x86: io_apic: Fix CONFIG_X86_IO_APIC=n breakage
x86: apic: Move probe_nr_irqs_gsi() into ioapic_init_mappings()
x86: Allow platforms to force enable apic
Diffstat (limited to 'arch/x86/platform/sfi/sfi.c')
| -rw-r--r-- | arch/x86/platform/sfi/sfi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/platform/sfi/sfi.c b/arch/x86/platform/sfi/sfi.c index dd4c281ffe5..ca54875ac79 100644 --- a/arch/x86/platform/sfi/sfi.c +++ b/arch/x86/platform/sfi/sfi.c @@ -48,9 +48,9 @@ static void __init mp_sfi_register_lapic_address(unsigned long address) /* All CPUs enumerated by SFI must be present and enabled */ static void __cpuinit mp_sfi_register_lapic(u8 id) { - if (MAX_APICS - id <= 0) { + if (MAX_LOCAL_APIC - id <= 0) { pr_warning("Processor #%d invalid (max %d)\n", - id, MAX_APICS); + id, MAX_LOCAL_APIC); return; } |