openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent

This commit is contained in:
Ingo Molnar 2011-06-22 16:25:34 +02:00
parent e08f6d4131 8fe7e94eb7
commit debf1d4948
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,8 +112,10 @@ static void nmi_cpu_start(void *dummy)
static int nmi_start(void) static int nmi_start(void)
{ {
get_online_cpus(); get_online_cpus();
on_each_cpu(nmi_cpu_start, NULL, 1);
ctr_running = 1; ctr_running = 1;
/* make ctr_running visible to the nmi handler: */
smp_mb();
on_each_cpu(nmi_cpu_start, NULL, 1);
put_online_cpus(); put_online_cpus();
return 0; return 0;
} }
@ -504,15 +506,18 @@ static int nmi_setup(void)
nmi_enabled = 0; nmi_enabled = 0;
ctr_running = 0; ctr_running = 0;
barrier(); /* make variables visible to the nmi handler: */
smp_mb();
err = register_die_notifier(&profile_exceptions_nb); err = register_die_notifier(&profile_exceptions_nb);
if (err) if (err)
goto fail; goto fail;
get_online_cpus(); get_online_cpus();
register_cpu_notifier(&oprofile_cpu_nb); register_cpu_notifier(&oprofile_cpu_nb);
on_each_cpu(nmi_cpu_setup, NULL, 1);
nmi_enabled = 1; nmi_enabled = 1;
/* make nmi_enabled visible to the nmi handler: */
smp_mb();
on_each_cpu(nmi_cpu_setup, NULL, 1);
put_online_cpus(); put_online_cpus();
return 0; return 0;
@ -531,7 +536,8 @@ static void nmi_shutdown(void)
nmi_enabled = 0; nmi_enabled = 0;
ctr_running = 0; ctr_running = 0;
put_online_cpus(); put_online_cpus();
barrier(); /* make variables visible to the nmi handler: */
smp_mb();
unregister_die_notifier(&profile_exceptions_nb); unregister_die_notifier(&profile_exceptions_nb);
msrs = &get_cpu_var(cpu_msrs); msrs = &get_cpu_var(cpu_msrs);
model->shutdown(msrs); model->shutdown(msrs);