From b5bce2ffb924ebedaf7fe6c9e183a1a125171053 Mon Sep 17 00:00:00 2001
From: Bernhard Kaindl <bk@suse.de>
Date: Wed, 2 May 2007 19:27:17 +0200
Subject: [PATCH] --- yaml --- r: 53889 b: refs/heads/master c:
 2b3b4835c94226681c496de9446d456dcf42ed08 h: refs/heads/master i:   53887:
 44251c6c050e939336083985d7c26ca94c8a72f6 v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/i386/kernel/cpu/mtrr/generic.c | 7 ++++++-
 trunk/include/asm-i386/mtrr.h             | 2 ++
 trunk/include/asm-x86_64/mtrr.h           | 2 ++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ba8889cda409..ddac90af98f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 856f44ff4af6e57fdc39a8b2bec498c88438bd27
+refs/heads/master: 2b3b4835c94226681c496de9446d456dcf42ed08
diff --git a/trunk/arch/i386/kernel/cpu/mtrr/generic.c b/trunk/arch/i386/kernel/cpu/mtrr/generic.c
index 68b383788882..150cf5055a3c 100644
--- a/trunk/arch/i386/kernel/cpu/mtrr/generic.c
+++ b/trunk/arch/i386/kernel/cpu/mtrr/generic.c
@@ -37,7 +37,7 @@ get_mtrr_var_range(unsigned int index, struct mtrr_var_range *vr)
 	rdmsr(MTRRphysMask_MSR(index), vr->mask_lo, vr->mask_hi);
 }
 
-static void __init
+static void
 get_fixed_ranges(mtrr_type * frs)
 {
 	unsigned int *p = (unsigned int *) frs;
@@ -51,6 +51,11 @@ get_fixed_ranges(mtrr_type * frs)
 		rdmsr(MTRRfix4K_C0000_MSR + i, p[6 + i * 2], p[7 + i * 2]);
 }
 
+void mtrr_save_fixed_ranges(void *info)
+{
+	get_fixed_ranges(mtrr_state.fixed_ranges);
+}
+
 static void __init print_fixed(unsigned base, unsigned step, const mtrr_type*types)
 {
 	unsigned i;
diff --git a/trunk/include/asm-i386/mtrr.h b/trunk/include/asm-i386/mtrr.h
index 07f063ae26ea..02a41b99bd7e 100644
--- a/trunk/include/asm-i386/mtrr.h
+++ b/trunk/include/asm-i386/mtrr.h
@@ -69,6 +69,7 @@ struct mtrr_gentry
 
 /*  The following functions are for use by other drivers  */
 # ifdef CONFIG_MTRR
+extern void mtrr_save_fixed_ranges(void *);
 extern int mtrr_add (unsigned long base, unsigned long size,
 		     unsigned int type, char increment);
 extern int mtrr_add_page (unsigned long base, unsigned long size,
@@ -79,6 +80,7 @@ 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
+#define mtrr_save_fixed_ranges(arg) do {} while (0)
 static __inline__ int mtrr_add (unsigned long base, unsigned long size,
 				unsigned int type, char increment)
 {
diff --git a/trunk/include/asm-x86_64/mtrr.h b/trunk/include/asm-x86_64/mtrr.h
index 66809eca98cf..1b326cbb9305 100644
--- a/trunk/include/asm-x86_64/mtrr.h
+++ b/trunk/include/asm-x86_64/mtrr.h
@@ -138,9 +138,11 @@ struct mtrr_gentry32
 #ifdef CONFIG_MTRR
 extern void mtrr_ap_init(void);
 extern void mtrr_bp_init(void);
+extern void mtrr_save_fixed_ranges(void *);
 #else
 #define mtrr_ap_init() do {} while (0)
 #define mtrr_bp_init() do {} while (0)
+#define mtrr_save_fixed_ranges(arg) do {} while (0)
 #endif
 
 #endif /* __KERNEL__ */