diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 18:55:17 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 18:55:17 +0200 |
commit | 520b9617ab4aea764ddfc5d58cae21c16b3318e1 (patch) | |
tree | 1612249d11d455cfd6a0d691f5564673ae179c5f /include/asm-x86/genapic_64.h | |
parent | f57e91682d141ea50d8c6d42cdc251b6256a3755 (diff) | |
parent | f87f38ec5a5157aa39f44f6018dc58ea62f8e0e2 (diff) |
Merge branch 'x86/core' into x86/generalize-visws
Diffstat (limited to 'include/asm-x86/genapic_64.h')
-rw-r--r-- | include/asm-x86/genapic_64.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-x86/genapic_64.h b/include/asm-x86/genapic_64.h index 1de931b263c..647e4e5c258 100644 --- a/include/asm-x86/genapic_64.h +++ b/include/asm-x86/genapic_64.h @@ -44,4 +44,12 @@ DECLARE_PER_CPU(int, x2apic_extra_bits); extern void uv_cpu_init(void); 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 |