diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-07-25 05:14:28 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 10:31:33 -0400 |
commit | a4dbc34d181e87a0d724dee365921e9251f831d4 (patch) | |
tree | 952a2ff188e5b4d40181578455831535fb227469 /arch/x86/kernel/io_apic_32.c | |
parent | 10d3285d0b3af641ee446f0be8f0a7f40cb515b6 (diff) |
x86: add setup_ioapic_ids for numaq in x86_quirks
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/io_apic_32.c')
-rw-r--r-- | arch/x86/kernel/io_apic_32.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c index 98e4db5373f3..72ba06314c7b 100644 --- a/arch/x86/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #include <asm/nmi.h> | 46 | #include <asm/nmi.h> |
47 | #include <asm/msidef.h> | 47 | #include <asm/msidef.h> |
48 | #include <asm/hypertransport.h> | 48 | #include <asm/hypertransport.h> |
49 | #include <asm/setup.h> | ||
49 | 50 | ||
50 | #include <mach_apic.h> | 51 | #include <mach_apic.h> |
51 | #include <mach_apicdef.h> | 52 | #include <mach_apicdef.h> |
@@ -1728,10 +1729,8 @@ static void __init setup_ioapic_ids_from_mpc(void) | |||
1728 | unsigned char old_id; | 1729 | unsigned char old_id; |
1729 | unsigned long flags; | 1730 | unsigned long flags; |
1730 | 1731 | ||
1731 | #ifdef CONFIG_X86_NUMAQ | 1732 | if (x86_quirks->setup_ioapic_ids && x86_quirks->setup_ioapic_ids()) |
1732 | if (found_numaq) | ||
1733 | return; | 1733 | return; |
1734 | #endif | ||
1735 | 1734 | ||
1736 | /* | 1735 | /* |
1737 | * Don't check I/O APIC IDs for xAPIC systems. They have | 1736 | * Don't check I/O APIC IDs for xAPIC systems. They have |