diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-23 12:20:15 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-23 12:20:15 +0300 |
| commit | bfe2a3c3b5bf479788d5d5c5561346be6b169043 (patch) | |
| tree | 652c987279db7cd841d556f7bb1a589b57fbd6cc /arch/x86/kernel/entry_64.S | |
| parent | 77835492ed489c0b870f82f4c50687bd267acc0a (diff) | |
| parent | 35d266a24796f02f63299cfe5009dfc0d5a0e820 (diff) | |
| download | linux-bfe2a3c3b5bf479788d5d5c5561346be6b169043.tar.xz | |
Merge branch 'core/percpu' into perfcounters/core
Conflicts:
arch/x86/include/asm/hardirq_32.h
arch/x86/include/asm/hardirq_64.h
Semantic merge:
arch/x86/include/asm/hardirq.h
[ added apic_perf_irqs field. ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/entry_64.S')
| -rw-r--r-- | arch/x86/kernel/entry_64.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index c092e7d2686d..eb0a0703f4c9 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -982,8 +982,10 @@ apicinterrupt IRQ_MOVE_CLEANUP_VECTOR \ irq_move_cleanup_interrupt smp_irq_move_cleanup_interrupt #endif +#ifdef CONFIG_X86_UV apicinterrupt UV_BAU_MESSAGE \ uv_bau_message_intr1 uv_bau_message_interrupt +#endif apicinterrupt LOCAL_TIMER_VECTOR \ apic_timer_interrupt smp_apic_timer_interrupt |