From 4322ca98a6bdeb8df58e09d52045451698e9dc15 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Fri, 23 Jun 2006 02:04:18 -0700
Subject: [PATCH] --- yaml --- r: 28980 b: refs/heads/master c:
 27b07da7332f03a935cd13b6a6beb780bf19e7a4 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/i386/kernel/cpu/common.c | 1 +
 trunk/arch/i386/power/cpu.c         | 1 +
 trunk/include/asm-i386/mtrr.h       | 4 ++++
 trunk/include/asm-i386/processor.h  | 8 --------
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index aa81ab17ad3f..bab821659a15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87af2ffd4ccd0e6a2ff316fd008a9bedb4a4cb66
+refs/heads/master: 27b07da7332f03a935cd13b6a6beb780bf19e7a4
diff --git a/trunk/arch/i386/kernel/cpu/common.c b/trunk/arch/i386/kernel/cpu/common.c
index a06a49075f10..f2a2b0ac9a18 100644
--- a/trunk/arch/i386/kernel/cpu/common.c
+++ b/trunk/arch/i386/kernel/cpu/common.c
@@ -11,6 +11,7 @@
 #include <asm/msr.h>
 #include <asm/io.h>
 #include <asm/mmu_context.h>
+#include <asm/mtrr.h>
 #ifdef CONFIG_X86_LOCAL_APIC
 #include <asm/mpspec.h>
 #include <asm/apic.h>
diff --git a/trunk/arch/i386/power/cpu.c b/trunk/arch/i386/power/cpu.c
index 79b2370c7fac..63d25ca6306f 100644
--- a/trunk/arch/i386/power/cpu.c
+++ b/trunk/arch/i386/power/cpu.c
@@ -10,6 +10,7 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/suspend.h>
+#include <asm/mtrr.h>
 
 static struct saved_context saved_context;
 
diff --git a/trunk/include/asm-i386/mtrr.h b/trunk/include/asm-i386/mtrr.h
index 5a46de08efea..07f063ae26ea 100644
--- a/trunk/include/asm-i386/mtrr.h
+++ b/trunk/include/asm-i386/mtrr.h
@@ -76,6 +76,8 @@ extern int mtrr_add_page (unsigned long base, unsigned long size,
 extern int mtrr_del (int reg, unsigned long base, unsigned long size);
 extern int mtrr_del_page (int reg, unsigned long base, unsigned long size);
 extern void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi);
+extern void mtrr_ap_init(void);
+extern void mtrr_bp_init(void);
 #  else
 static __inline__ int mtrr_add (unsigned long base, unsigned long size,
 				unsigned int type, char increment)
@@ -100,6 +102,8 @@ static __inline__ int mtrr_del_page (int reg, unsigned long base,
 
 static __inline__ void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi) {;}
 
+#define mtrr_ap_init() do {} while (0)
+#define mtrr_bp_init() do {} while (0)
 #  endif
 
 #endif
diff --git a/trunk/include/asm-i386/processor.h b/trunk/include/asm-i386/processor.h
index 4df3818e4122..5116465272ec 100644
--- a/trunk/include/asm-i386/processor.h
+++ b/trunk/include/asm-i386/processor.h
@@ -728,14 +728,6 @@ extern unsigned long boot_option_idle_override;
 extern void enable_sep_cpu(void);
 extern int sysenter_setup(void);
 
-#ifdef CONFIG_MTRR
-extern void mtrr_ap_init(void);
-extern void mtrr_bp_init(void);
-#else
-#define mtrr_ap_init() do {} while (0)
-#define mtrr_bp_init() do {} while (0)
-#endif
-
 #ifdef CONFIG_X86_MCE
 extern void mcheck_init(struct cpuinfo_x86 *c);
 #else