diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-10 14:58:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-10 16:26:43 +0200 |
| commit | 47f16ca7631f9c6bad8e6d968cfb1433029b09ec (patch) | |
| tree | 182a5bf4607bf31b02e90efa065ce5e3d2eeabc9 | |
| parent | abdb5a5713330e17dfe91ab0d3e29c4744d95162 (diff) | |
| download | talos-obmc-linux-47f16ca7631f9c6bad8e6d968cfb1433029b09ec.tar.gz talos-obmc-linux-47f16ca7631f9c6bad8e6d968cfb1433029b09ec.zip | |
x86, irqinit: preempt merge conflicts
To make the topic merge life easier for tip:perfcounters/core,
include two (inactive in this topic) IRQ vector initializations
here.
Also fix build bug - missing kprobes.h inclusion.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/kernel/irqinit.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c index 626977200a58..b424c32c4a0c 100644 --- a/arch/x86/kernel/irqinit.c +++ b/arch/x86/kernel/irqinit.c @@ -7,6 +7,7 @@ #include <linux/timex.h> #include <linux/slab.h> #include <linux/random.h> +#include <linux/kprobes.h> #include <linux/init.h> #include <linux/kernel_stat.h> #include <linux/sysdev.h> @@ -195,6 +196,13 @@ static void __init apic_intr_init(void) /* IPI vectors for APIC spurious and error interrupts */ alloc_intr_gate(SPURIOUS_APIC_VECTOR, spurious_interrupt); alloc_intr_gate(ERROR_APIC_VECTOR, error_interrupt); + + /* Performance monitoring interrupts: */ +# ifdef CONFIG_PERF_COUNTERS + alloc_intr_gate(LOCAL_PERF_VECTOR, perf_counter_interrupt); + alloc_intr_gate(LOCAL_PENDING_VECTOR, perf_pending_interrupt); +# endif + #endif #ifdef CONFIG_X86_32 |
