From 33b201534d8f3bf7fe6c67c6fbbd68ce4ef117b1 Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Thu, 9 Jul 2009 16:29:34 +0200 Subject: [PATCH] --- yaml --- r: 158225 b: refs/heads/master c: 82a225283fb0d9438549595d9e6f3ecc42b42ad6 h: refs/heads/master i: 158223: f673fe11a88e2495a8e732ed85b9db1b4dc088ea v: v3 --- [refs] | 2 +- trunk/arch/x86/oprofile/nmi_int.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1b4685cf44b9..bb7fc0784000 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e766e3e433fa2d5d2fdfd8e2432804c91393387 +refs/heads/master: 82a225283fb0d9438549595d9e6f3ecc42b42ad6 diff --git a/trunk/arch/x86/oprofile/nmi_int.c b/trunk/arch/x86/oprofile/nmi_int.c index e54f6a0b35ac..8cd4658370be 100644 --- a/trunk/arch/x86/oprofile/nmi_int.c +++ b/trunk/arch/x86/oprofile/nmi_int.c @@ -294,7 +294,7 @@ static void nmi_cpu_shutdown(void *dummy) { unsigned int v; int cpu = smp_processor_id(); - struct op_msrs *msrs = &__get_cpu_var(cpu_msrs); + struct op_msrs *msrs = &per_cpu(cpu_msrs, cpu); /* restoring APIC_LVTPC can trigger an apic error because the delivery * mode and vector nr combination can be illegal. That's by design: on @@ -307,7 +307,7 @@ static void nmi_cpu_shutdown(void *dummy) apic_write(APIC_LVTERR, v); nmi_cpu_restore_registers(msrs); #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX - __get_cpu_var(switch_index) = 0; + per_cpu(switch_index, cpu) = 0; #endif }