diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-19 20:49:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-19 20:49:37 +0100 |
| commit | 5cdc5e9e69d4dc3a3630ae1fa666401b2a8dcde6 (patch) | |
| tree | 62032100bc8fb814f4c7b76c327144d5254ebfa3 /arch | |
| parent | 7890ba8c87604ca4c2c73f7de846bf5305d743e4 (diff) | |
x86: fully honor "nolapic", fix
Impact: build fix
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/apic.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c index 48578795583..9ca12af6c87 100644 --- a/arch/x86/kernel/apic.c +++ b/arch/x86/kernel/apic.c @@ -1131,7 +1131,9 @@ void __cpuinit setup_local_APIC(void) int i, j; if (disable_apic) { +#ifdef CONFIG_X86_IO_APIC disable_ioapic_setup(); +#endif return; } |