diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/oprofile/nmi_int.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index e54f6a0b35ac..8cd4658370be 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c | |||
@@ -294,7 +294,7 @@ static void nmi_cpu_shutdown(void *dummy) | |||
294 | { | 294 | { |
295 | unsigned int v; | 295 | unsigned int v; |
296 | int cpu = smp_processor_id(); | 296 | int cpu = smp_processor_id(); |
297 | struct op_msrs *msrs = &__get_cpu_var(cpu_msrs); | 297 | struct op_msrs *msrs = &per_cpu(cpu_msrs, cpu); |
298 | 298 | ||
299 | /* restoring APIC_LVTPC can trigger an apic error because the delivery | 299 | /* restoring APIC_LVTPC can trigger an apic error because the delivery |
300 | * mode and vector nr combination can be illegal. That's by design: on | 300 | * mode and vector nr combination can be illegal. That's by design: on |
@@ -307,7 +307,7 @@ static void nmi_cpu_shutdown(void *dummy) | |||
307 | apic_write(APIC_LVTERR, v); | 307 | apic_write(APIC_LVTERR, v); |
308 | nmi_cpu_restore_registers(msrs); | 308 | nmi_cpu_restore_registers(msrs); |
309 | #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX | 309 | #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX |
310 | __get_cpu_var(switch_index) = 0; | 310 | per_cpu(switch_index, cpu) = 0; |
311 | #endif | 311 | #endif |
312 | } | 312 | } |
313 | 313 | ||