diff options
| author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2008-04-04 15:41:07 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:34 -0400 |
| commit | 61048c6328819b0973ef662f6d46f2e2bc753ceb (patch) | |
| tree | 09efa08f2e4a18b191769aad558144c2bde404df /include/asm-x86/mach-default | |
| parent | 16ecf7a47cf4f1c97189a551b001195aed550cc2 (diff) | |
x86: don't set IO APIC features if IO APIC is not enabled
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/mach-default')
| -rw-r--r-- | include/asm-x86/mach-default/mach_apic.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/mach-default/mach_apic.h b/include/asm-x86/mach-default/mach_apic.h index 14217a970c5e..0a6634f62abe 100644 --- a/include/asm-x86/mach-default/mach_apic.h +++ b/include/asm-x86/mach-default/mach_apic.h | |||
| @@ -69,8 +69,10 @@ static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) | |||
| 69 | 69 | ||
| 70 | static inline void setup_apic_routing(void) | 70 | static inline void setup_apic_routing(void) |
| 71 | { | 71 | { |
| 72 | #ifdef CONFIG_X86_IO_APIC | ||
| 72 | printk("Enabling APIC mode: %s. Using %d I/O APICs\n", | 73 | printk("Enabling APIC mode: %s. Using %d I/O APICs\n", |
| 73 | "Flat", nr_ioapics); | 74 | "Flat", nr_ioapics); |
| 75 | #endif | ||
| 74 | } | 76 | } |
| 75 | 77 | ||
| 76 | static inline int apicid_to_node(int logical_apicid) | 78 | static inline int apicid_to_node(int logical_apicid) |