From a1ece61b5ced6b49bdfa9b62d9ce51a445dfab6d Mon Sep 17 00:00:00 2001
From: Stephane Eranian <eranian@hpl.hp.com>
Date: Wed, 17 Oct 2007 18:04:32 +0200
Subject: [PATCH] --- yaml --- r: 70940 b: refs/heads/master c:
 0f8e45a288991ff24951b83fe83cf3eb011bbaed h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/oprofile/nmi_int.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8f28c77c07c2..3adf7edc7349 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dfbc88464934fb6924a388bc03961d44f387926
+refs/heads/master: 0f8e45a288991ff24951b83fe83cf3eb011bbaed
diff --git a/trunk/arch/x86/oprofile/nmi_int.c b/trunk/arch/x86/oprofile/nmi_int.c
index 11b7a51566a8..2d0eeac7251f 100644
--- a/trunk/arch/x86/oprofile/nmi_int.c
+++ b/trunk/arch/x86/oprofile/nmi_int.c
@@ -269,7 +269,6 @@ static void nmi_cpu_shutdown(void * dummy)
 	apic_write(APIC_LVTPC, saved_lvtpc[cpu]);
 	apic_write(APIC_LVTERR, v);
 	nmi_restore_registers(msrs);
-	model->shutdown(msrs);
 }
 
  
@@ -278,6 +277,7 @@ static void nmi_shutdown(void)
 	nmi_enabled = 0;
 	on_each_cpu(nmi_cpu_shutdown, NULL, 0, 1);
 	unregister_die_notifier(&profile_exceptions_nb);
+	model->shutdown(cpu_msrs);
 	free_msrs();
 }