From 9603cd366774cd6efaaec78858f104f6ad460163 Mon Sep 17 00:00:00 2001
From: Andrea Righi <righi.andrea@gmail.com>
Date: Sat, 20 Sep 2008 18:02:27 +0200
Subject: [PATCH] --- yaml --- r: 109970 b: refs/heads/master c:
 b61e06f258e50b25c38a73bea782bdb6876f0f70 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6c2630be3312..b2ebc3530b8a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e4f88da7bf1887563f70bd5edbbd0479e31dc12
+refs/heads/master: b61e06f258e50b25c38a73bea782bdb6876f0f70
diff --git a/trunk/arch/x86/oprofile/nmi_int.c b/trunk/arch/x86/oprofile/nmi_int.c
index 0227694f7dab..8a5f1614a3d5 100644
--- a/trunk/arch/x86/oprofile/nmi_int.c
+++ b/trunk/arch/x86/oprofile/nmi_int.c
@@ -295,10 +295,12 @@ static void nmi_cpu_shutdown(void *dummy)
 
 static void nmi_shutdown(void)
 {
-	struct op_msrs *msrs = &get_cpu_var(cpu_msrs);
+	struct op_msrs *msrs;
+
 	nmi_enabled = 0;
 	on_each_cpu(nmi_cpu_shutdown, NULL, 1);
 	unregister_die_notifier(&profile_exceptions_nb);
+	msrs = &get_cpu_var(cpu_msrs);
 	model->shutdown(msrs);
 	free_msrs();
 	put_cpu_var(cpu_msrs);