android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perfcounters: fix "perf counters kill oprofile" bug

Browse Source 
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>
This commit is contained in:
Mike Galbraith
2009-02-04 17:11:34 +01:00
committed by Ingo Molnar
parent 15081c6136
commit 5b75af0a02
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/cpu/perf_counter.c
View File

@ -643,7 +643,9 @@ perf_counter_nmi_handler(struct notifier_block *self,
} }
static __read_mostly struct notifier_block perf_counter_nmi_notifier = { static __read_mostly struct notifier_block perf_counter_nmi_notifier = {
.notifier_call = perf_counter_nmi_handler .notifier_call = perf_counter_nmi_handler,
.next = NULL,
.priority = 1
}; };
void __init init_hw_perf_counters(void) void __init init_hw_perf_counters(void)

7
arch/x86/oprofile/nmi_int.c
View File

@ -40,8 +40,9 @@ static int profile_exceptions_notify(struct notifier_block *self,
switch (val) { switch (val) {
case DIE_NMI: case DIE_NMI:
if (model->check_ctrs(args->regs, &per_cpu(cpu_msrs, cpu))) case DIE_NMI_IPI:
ret = NOTIFY_STOP; model->check_ctrs(args->regs, &per_cpu(cpu_msrs, cpu));
ret = NOTIFY_STOP;
break; break;
default: default:
break; break;
@ -134,7 +135,7 @@ static void nmi_cpu_setup(void *dummy)
static struct notifier_block profile_exceptions_nb = { static struct notifier_block profile_exceptions_nb = {
.notifier_call = profile_exceptions_notify, .notifier_call = profile_exceptions_notify,
.next = NULL, .next = NULL,
.priority = 0 .priority = 2
}; };
static int nmi_setup(void) static int nmi_setup(void)