From e2c747691925d6e054bfc7ccbccb12d663776ebb Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 10 Apr 2009 14:58:05 +0200
Subject: [PATCH] --- yaml --- r: 145599 b: refs/heads/master c:
 47f16ca7631f9c6bad8e6d968cfb1433029b09ec h: refs/heads/master i:   145597:
 11ba45682abb8353b5fae03a7a8fbbf96b939fa3   145595:
 af8ab14801156a1a7b509d0d7b1b5aefb936c4c1   145591:
 40bc3393eae4b3f9e34bc455bfb044e13c7151c6   145583:
 3bd23423ef7210948a708097288bd1c0c7de662c   145567:
 f8fa893f51ec9d1aa0d813f4398526cfd662cd5f   145535:
 31520193b75a5ed1d9cfd1d1a8de25836face410 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/irqinit.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3253fb0276e1..79a9179d9b94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abdb5a5713330e17dfe91ab0d3e29c4744d95162
+refs/heads/master: 47f16ca7631f9c6bad8e6d968cfb1433029b09ec
diff --git a/trunk/arch/x86/kernel/irqinit.c b/trunk/arch/x86/kernel/irqinit.c
index 626977200a58..b424c32c4a0c 100644
--- a/trunk/arch/x86/kernel/irqinit.c
+++ b/trunk/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