]> err.no Git - linux-2.6/commitdiff
x86: build fix for "x86: fix C1E && nx6325 stability problem"
authorIngo Molnar <mingo@elte.hu>
Wed, 9 Jul 2008 11:07:23 +0000 (13:07 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 10 Jul 2008 06:09:08 +0000 (08:09 +0200)
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>
include/asm-x86/genapic_32.h
include/asm-x86/genapic_64.h

index 8d4c8bdb90656e74befb80957929694127ee695a..33a73f5ed222b57be0ada70c84792388803a1ceb 100644 (file)
@@ -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
index 082ad020e4127fed6f8ae8532f0298addf84efb2..647e4e5c25803aac39516c71ee616dbdd1d5faec 100644 (file)
@@ -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