diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:39:59 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:39:59 -0400 |
commit | 0679c2f47d50651018dd5e0bf35330f6e6ae35ec (patch) | |
tree | 2df65ebb958f930abf0b7ad35fd6e528398b1679 /arch/x86/oprofile/nmi_int.c | |
parent | 76fbc263ff7e42ce8b21b8aee176e3c74b45f81a (diff) | |
parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) |
Merge branch 'linus' into pci-for-jesse
Diffstat (limited to 'arch/x86/oprofile/nmi_int.c')
-rw-r--r-- | arch/x86/oprofile/nmi_int.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index cc48d3fde545..7f3329b55d2e 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c | |||
@@ -218,8 +218,8 @@ static int nmi_setup(void) | |||
218 | } | 218 | } |
219 | 219 | ||
220 | } | 220 | } |
221 | on_each_cpu(nmi_save_registers, NULL, 0, 1); | 221 | on_each_cpu(nmi_save_registers, NULL, 1); |
222 | on_each_cpu(nmi_cpu_setup, NULL, 0, 1); | 222 | on_each_cpu(nmi_cpu_setup, NULL, 1); |
223 | nmi_enabled = 1; | 223 | nmi_enabled = 1; |
224 | return 0; | 224 | return 0; |
225 | } | 225 | } |
@@ -269,12 +269,13 @@ static void nmi_cpu_shutdown(void *dummy) | |||
269 | 269 | ||
270 | static void nmi_shutdown(void) | 270 | static void nmi_shutdown(void) |
271 | { | 271 | { |
272 | struct op_msrs *msrs = &__get_cpu_var(cpu_msrs); | 272 | struct op_msrs *msrs = &get_cpu_var(cpu_msrs); |
273 | nmi_enabled = 0; | 273 | nmi_enabled = 0; |
274 | on_each_cpu(nmi_cpu_shutdown, NULL, 0, 1); | 274 | on_each_cpu(nmi_cpu_shutdown, NULL, 1); |
275 | unregister_die_notifier(&profile_exceptions_nb); | 275 | unregister_die_notifier(&profile_exceptions_nb); |
276 | model->shutdown(msrs); | 276 | model->shutdown(msrs); |
277 | free_msrs(); | 277 | free_msrs(); |
278 | put_cpu_var(cpu_msrs); | ||
278 | } | 279 | } |
279 | 280 | ||
280 | static void nmi_cpu_start(void *dummy) | 281 | static void nmi_cpu_start(void *dummy) |
@@ -285,7 +286,7 @@ static void nmi_cpu_start(void *dummy) | |||
285 | 286 | ||
286 | static int nmi_start(void) | 287 | static int nmi_start(void) |
287 | { | 288 | { |
288 | on_each_cpu(nmi_cpu_start, NULL, 0, 1); | 289 | on_each_cpu(nmi_cpu_start, NULL, 1); |
289 | return 0; | 290 | return 0; |
290 | } | 291 | } |
291 | 292 | ||
@@ -297,7 +298,7 @@ static void nmi_cpu_stop(void *dummy) | |||
297 | 298 | ||
298 | static void nmi_stop(void) | 299 | static void nmi_stop(void) |
299 | { | 300 | { |
300 | on_each_cpu(nmi_cpu_stop, NULL, 0, 1); | 301 | on_each_cpu(nmi_cpu_stop, NULL, 1); |
301 | } | 302 | } |
302 | 303 | ||
303 | struct op_counter_config counter_config[OP_MAX_COUNTER]; | 304 | struct op_counter_config counter_config[OP_MAX_COUNTER]; |