From 9b9d6b631e2073179fc637ab7be9842d5963c1fb Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Fri, 21 Aug 2009 17:00:02 -0700
Subject: [PATCH] --- yaml --- r: 161392 b: refs/heads/master c:
 5400743db5a06a4e6e298725a2044c40edcb27b9 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/x86/include/asm/mtrr.h     | 1 -
 trunk/arch/x86/kernel/cpu/mtrr/main.c | 6 +++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index dd461a422024..5ff60aa5adb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0af9eed5aa91b6b7b5049cae69e5ea956fd85c3
+refs/heads/master: 5400743db5a06a4e6e298725a2044c40edcb27b9
diff --git a/trunk/arch/x86/include/asm/mtrr.h b/trunk/arch/x86/include/asm/mtrr.h
index d5366ec5cb8f..4365ffdb461f 100644
--- a/trunk/arch/x86/include/asm/mtrr.h
+++ b/trunk/arch/x86/include/asm/mtrr.h
@@ -126,7 +126,6 @@ extern void mtrr_aps_init(void);
 extern void mtrr_bp_restore(void);
 extern int mtrr_trim_uncached_memory(unsigned long end_pfn);
 extern int amd_special_default_mtrr(void);
-extern u32 mtrr_aps_delayed_init;
 #  else
 static inline u8 mtrr_type_lookup(u64 addr, u64 end)
 {
diff --git a/trunk/arch/x86/kernel/cpu/mtrr/main.c b/trunk/arch/x86/kernel/cpu/mtrr/main.c
index 7339be0aa580..84e83de54575 100644
--- a/trunk/arch/x86/kernel/cpu/mtrr/main.c
+++ b/trunk/arch/x86/kernel/cpu/mtrr/main.c
@@ -58,7 +58,7 @@ unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
 static DEFINE_MUTEX(mtrr_mutex);
 
 u64 size_or_mask, size_and_mask;
-u32 mtrr_aps_delayed_init;
+static bool mtrr_aps_delayed_init;
 
 static struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
 
@@ -758,7 +758,7 @@ void set_mtrr_aps_delayed_init(void)
 	if (!use_intel())
 		return;
 
-	mtrr_aps_delayed_init = 1;
+	mtrr_aps_delayed_init = true;
 }
 
 /*
@@ -770,7 +770,7 @@ void mtrr_aps_init(void)
 		return;
 
 	set_mtrr(~0U, 0, 0, 0);
-	mtrr_aps_delayed_init = 0;
+	mtrr_aps_delayed_init = false;
 }
 
 void mtrr_bp_restore(void)