aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic/apic.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/apic/apic.c')
-rw-r--r--arch/x86/kernel/apic/apic.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index f9cecdfd05c..4732768c534 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -34,6 +34,7 @@
34#include <linux/smp.h> 34#include <linux/smp.h>
35#include <linux/mm.h> 35#include <linux/mm.h>
36 36
37#include <asm/perf_counter.h>
37#include <asm/pgalloc.h> 38#include <asm/pgalloc.h>
38#include <asm/atomic.h> 39#include <asm/atomic.h>
39#include <asm/mpspec.h> 40#include <asm/mpspec.h>
@@ -754,6 +755,8 @@ static void local_apic_timer_interrupt(void)
754 inc_irq_stat(apic_timer_irqs); 755 inc_irq_stat(apic_timer_irqs);
755 756
756 evt->event_handler(evt); 757 evt->event_handler(evt);
758
759 perf_counter_unthrottle();
757} 760}
758 761
759/* 762/*
@@ -1118,6 +1121,7 @@ void __cpuinit setup_local_APIC(void)
1118 apic_write(APIC_ESR, 0); 1121 apic_write(APIC_ESR, 0);
1119 } 1122 }
1120#endif 1123#endif
1124 perf_counters_lapic_init(0);
1121 1125
1122 preempt_disable(); 1126 preempt_disable();
1123 1127