From 3bde0d669737fcfb91a65eb2e15feec781e636ea Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Sun, 3 Jun 2007 13:50:40 -0700
Subject: [PATCH] --- yaml --- r: 57317 b: refs/heads/master c:
 4c738480d21a190e3d99c7ce985ab9484f373a3c h: refs/heads/master i:   57315:
 1d2783b4c5593e4b64a8731c9b0d48c74a2854d2 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/i386/kernel/cpu/mtrr/main.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b3e7365d1092..129feb2f0e5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e44a45ae7b7f7c7a4ebd6aa39b703bf2b97fe848
+refs/heads/master: 4c738480d21a190e3d99c7ce985ab9484f373a3c
diff --git a/trunk/arch/i386/kernel/cpu/mtrr/main.c b/trunk/arch/i386/kernel/cpu/mtrr/main.c
index 1cf466df330a..7202b98aac4f 100644
--- a/trunk/arch/i386/kernel/cpu/mtrr/main.c
+++ b/trunk/arch/i386/kernel/cpu/mtrr/main.c
@@ -734,10 +734,13 @@ void mtrr_ap_init(void)
  */
 void mtrr_save_state(void)
 {
-	if (smp_processor_id() == 0)
+	int cpu = get_cpu();
+
+	if (cpu == 0)
 		mtrr_save_fixed_ranges(NULL);
 	else
 		smp_call_function_single(0, mtrr_save_fixed_ranges, NULL, 1, 1);
+	put_cpu();
 }
 
 static int __init mtrr_init_finialize(void)