diff options
| author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2008-04-04 23:41:07 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 17:41:34 +0200 |
| commit | 61048c6328819b0973ef662f6d46f2e2bc753ceb (patch) | |
| tree | 09efa08f2e4a18b191769aad558144c2bde404df /include | |
| parent | 16ecf7a47cf4f1c97189a551b001195aed550cc2 (diff) | |
| download | blackbird-op-linux-61048c6328819b0973ef662f6d46f2e2bc753ceb.tar.gz blackbird-op-linux-61048c6328819b0973ef662f6d46f2e2bc753ceb.zip | |
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')
| -rw-r--r-- | include/asm-x86/mach-default/mach_apic.h | 2 | ||||
| -rw-r--r-- | include/asm-x86/mpspec.h | 3 |
2 files changed, 2 insertions, 3 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) static inline void setup_apic_routing(void) { +#ifdef CONFIG_X86_IO_APIC printk("Enabling APIC mode: %s. Using %d I/O APICs\n", "Flat", nr_ioapics); +#endif } static inline int apicid_to_node(int logical_apicid) diff --git a/include/asm-x86/mpspec.h b/include/asm-x86/mpspec.h index 1f6445b147f8..08cc5e027958 100644 --- a/include/asm-x86/mpspec.h +++ b/include/asm-x86/mpspec.h @@ -36,9 +36,6 @@ extern int mp_bus_id_to_pci_bus[MAX_MP_BUSSES]; extern unsigned int boot_cpu_physical_apicid; extern int smp_found_config; -extern int nr_ioapics; -extern int mp_irq_entries; -extern struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES]; extern int mpc_default_type; extern unsigned long mp_lapic_addr; |
