Merge branch 'core' of git://amd64.org/linux/rric into perf/core

[karo-tx-linux.git] / arch / x86 / oprofile / nmi_int.c

diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index 990c35bfa88f7c9f98a7cb5b99604d568b644030..26b8a8514ee566e8a7d235a06de1037c2641adec 100644 (file)
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -344,10 +344,10 @@ static void nmi_cpu_setup(void *dummy)
        int cpu = smp_processor_id();
        struct op_msrs *msrs = &per_cpu(cpu_msrs, cpu);
        nmi_cpu_save_registers(msrs);
-       spin_lock(&oprofilefs_lock);
+       raw_spin_lock(&oprofilefs_lock);
        model->setup_ctrs(model, msrs);
        nmi_cpu_setup_mux(cpu, msrs);
-       spin_unlock(&oprofilefs_lock);
+       raw_spin_unlock(&oprofilefs_lock);
        per_cpu(saved_lvtpc, cpu) = apic_read(APIC_LVTPC);
        apic_write(APIC_LVTPC, APIC_DM_NMI);
 }
@@ -385,8 +385,6 @@ static void nmi_cpu_shutdown(void *dummy)
        apic_write(APIC_LVTPC, per_cpu(saved_lvtpc, cpu));
        apic_write(APIC_LVTERR, v);
        nmi_cpu_restore_registers(msrs);
-       if (model->cpu_down)
-               model->cpu_down();
 }
 
 static void nmi_cpu_up(void *dummy)