From 3ec67634e4e4c3a487320d797f2ce585f1204303 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Wed, 2 May 2007 19:27:17 +0200
Subject: [PATCH] --- yaml --- r: 53888 b: refs/heads/master c:
 856f44ff4af6e57fdc39a8b2bec498c88438bd27 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/include/asm-x86_64/mtrr.h  | 8 ++++++++
 trunk/include/asm-x86_64/proto.h | 7 -------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index f32010f54e4c..ba8889cda409 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03df4f6ee997589a84d5f9492c6419183724c710
+refs/heads/master: 856f44ff4af6e57fdc39a8b2bec498c88438bd27
diff --git a/trunk/include/asm-x86_64/mtrr.h b/trunk/include/asm-x86_64/mtrr.h
index d6135b2549bf..66809eca98cf 100644
--- a/trunk/include/asm-x86_64/mtrr.h
+++ b/trunk/include/asm-x86_64/mtrr.h
@@ -135,6 +135,14 @@ struct mtrr_gentry32
 
 #endif /* CONFIG_COMPAT */
 
+#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
+
 #endif /* __KERNEL__ */
 
 #endif  /*  _LINUX_MTRR_H  */
diff --git a/trunk/include/asm-x86_64/proto.h b/trunk/include/asm-x86_64/proto.h
index 98063bcb3b33..85255db1e82d 100644
--- a/trunk/include/asm-x86_64/proto.h
+++ b/trunk/include/asm-x86_64/proto.h
@@ -14,13 +14,6 @@ extern void pda_init(int);
 extern void early_idt_handler(void);
 
 extern void mcheck_init(struct cpuinfo_x86 *c);
-#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
 extern void init_memory_mapping(unsigned long start, unsigned long end);
 
 extern void system_call(void);