aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/perf_counter.c
diff options
context:
space:
mode:
authorMike Galbraith <efault@gmx.de>2009-02-04 11:11:34 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-04 11:36:18 -0500
commit5b75af0a02fcf3b8899f38ff6f22164c5d8e2fdd (patch)
tree9bc34da1216baf94222544d3f47aa42301a73e5d /arch/x86/kernel/cpu/perf_counter.c
parent15081c61362618a0c81cc8d04e45e7427bc1ed71 (diff)
perfcounters: fix "perf counters kill oprofile" bug
With oprofile as a module, and unloaded by profiling script, both oprofile and kerneltop work fine.. unless you leave kerneltop running when you start profiling, then you may see badness. Signed-off-by: Mike Galbraith <efault@gmx.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu/perf_counter.c')
-rw-r--r--arch/x86/kernel/cpu/perf_counter.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c
index 46c436cdd732..8bb213323fe8 100644
--- a/arch/x86/kernel/cpu/perf_counter.c
+++ b/arch/x86/kernel/cpu/perf_counter.c
@@ -643,7 +643,9 @@ perf_counter_nmi_handler(struct notifier_block *self,
643} 643}
644 644
645static __read_mostly struct notifier_block perf_counter_nmi_notifier = { 645static __read_mostly struct notifier_block perf_counter_nmi_notifier = {
646 .notifier_call = perf_counter_nmi_handler 646 .notifier_call = perf_counter_nmi_handler,
647 .next = NULL,
648 .priority = 1
647}; 649};
648 650
649void __init init_hw_perf_counters(void) 651void __init init_hw_perf_counters(void)