diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 22:50:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 22:50:34 +0200 |
| commit | a208f37a465e222218974ab20a31b42b7b4893b2 (patch) | |
| tree | 77c6acdd4be32024330a14f2618b814126ce7a20 /include/asm-x86/genapic_64.h | |
| parent | 511d9d34183662aada3890883e860b151d707e22 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/x2apic
Diffstat (limited to 'include/asm-x86/genapic_64.h')
| -rw-r--r-- | include/asm-x86/genapic_64.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-x86/genapic_64.h b/include/asm-x86/genapic_64.h index 8ff2589da93..2871b3fccb2 100644 --- a/include/asm-x86/genapic_64.h +++ b/include/asm-x86/genapic_64.h @@ -53,10 +53,4 @@ 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 |