diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-09 15:07:23 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 10:09:08 +0400 |
commit | 4fb3dc2729c22ed1b023475fe28b720460251de1 (patch) | |
tree | c6d7a5905654b7fafcee4e54b48bb64f19eb2169 /include/asm-x86 | |
parent | ad2fc2cd925300b8127cf682f5a1c7511ae9dd27 (diff) | |
download | linux-4fb3dc2729c22ed1b023475fe28b720460251de1.tar.xz |
x86: build fix for "x86: fix C1E && nx6325 stability problem"
fix:
arch/x86/kernel/built-in.o: In function `dmi_ignore_irq0_timer_override':
boot.c:(.init.text+0x3ea4): undefined reference to `force_mask_ioapic_irq_2'
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86')
-rw-r--r-- | include/asm-x86/genapic_32.h | 4 | ||||
-rw-r--r-- | include/asm-x86/genapic_64.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-x86/genapic_32.h b/include/asm-x86/genapic_32.h index 8d4c8bdb9065..33a73f5ed222 100644 --- a/include/asm-x86/genapic_32.h +++ b/include/asm-x86/genapic_32.h @@ -119,6 +119,10 @@ enum uv_system_type {UV_NONE, UV_LEGACY_APIC, UV_X2APIC, UV_NON_UNIQUE_APIC}; #define is_uv_system() 0 #define uv_wakeup_secondary(a, b) 1 +#ifdef CONFIG_X86_IO_APIC extern void force_mask_ioapic_irq_2(void); +#else +static inline void force_mask_ioapic_irq_2(void) { } +#endif #endif diff --git a/include/asm-x86/genapic_64.h b/include/asm-x86/genapic_64.h index 082ad020e412..647e4e5c2580 100644 --- a/include/asm-x86/genapic_64.h +++ b/include/asm-x86/genapic_64.h @@ -46,6 +46,10 @@ extern int uv_wakeup_secondary(int phys_apicid, unsigned int start_rip); extern void setup_apic_routing(void); +#ifdef CONFIG_X86_IO_APIC extern void force_mask_ioapic_irq_2(void); +#else +static inline void force_mask_ioapic_irq_2(void) { } +#endif #endif |