Commit 0f8e45a2 authored by Stephane Eranian's avatar Stephane Eranian Committed by Thomas Gleixner

i386: make Oprofile call shutdown() only once per session

Oprofile: call model->shutdown() only once to avoid calling release_ev*()
multiple times

[ tglx: arch/x86 adaptation ]
Signed-off-by: default avatarStephane Eranian <eranian@hpl.hp.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 3dfbc884
...@@ -269,7 +269,6 @@ static void nmi_cpu_shutdown(void * dummy) ...@@ -269,7 +269,6 @@ static void nmi_cpu_shutdown(void * dummy)
apic_write(APIC_LVTPC, saved_lvtpc[cpu]); apic_write(APIC_LVTPC, saved_lvtpc[cpu]);
apic_write(APIC_LVTERR, v); apic_write(APIC_LVTERR, v);
nmi_restore_registers(msrs); nmi_restore_registers(msrs);
model->shutdown(msrs);
} }
...@@ -278,6 +277,7 @@ static void nmi_shutdown(void) ...@@ -278,6 +277,7 @@ static void nmi_shutdown(void)
nmi_enabled = 0; nmi_enabled = 0;
on_each_cpu(nmi_cpu_shutdown, NULL, 0, 1); on_each_cpu(nmi_cpu_shutdown, NULL, 0, 1);
unregister_die_notifier(&profile_exceptions_nb); unregister_die_notifier(&profile_exceptions_nb);
model->shutdown(cpu_msrs);
free_msrs(); free_msrs();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment