| commit | 5cdc5e9e69d4dc3a3630ae1fa666401b2a8dcde6 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Mon Jan 19 20:49:37 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Mon Jan 19 20:49:37 2009 +0100 |
| tree | 62032100bc8fb814f4c7b76c327144d5254ebfa3 | |
| parent | 7890ba8c87604ca4c2c73f7de846bf5305d743e4 [diff] |
x86: fully honor "nolapic", fix Impact: build fix Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c index 4857879..9ca12af 100644 --- a/arch/x86/kernel/apic.c +++ b/arch/x86/kernel/apic.c
@@ -1131,7 +1131,9 @@ int i, j; if (disable_apic) { +#ifdef CONFIG_X86_IO_APIC disable_ioapic_setup(); +#endif return; }