---

yaml --- r: 53891 b: refs/heads/master c: 3ebad59 h: refs/heads/master i: 53889: b5bce2f 53887: 44251c6 v: v3
git-mirror · May 2, 2007 · 826ee57 · 826ee57
1 parent 24fd36a
commit 826ee57
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b1f6278d77c1f2f669346fc2bb48012b5e9495a
+refs/heads/master: 3ebad5905609476a4ff1151a66b21d9794009961
diff --git a/trunk/arch/i386/power/cpu.c b/trunk/arch/i386/power/cpu.c
@@ -21,6 +21,7 @@ unsigned long saved_context_eflags;
 
 void __save_processor_state(struct saved_context *ctxt)
 {
+	mtrr_save_fixed_ranges(NULL);
 	kernel_fpu_begin();
 
 	/*

diff --git a/trunk/arch/x86_64/kernel/suspend.c b/trunk/arch/x86_64/kernel/suspend.c
@@ -12,6 +12,7 @@
 #include <asm/proto.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
+#include <asm/mtrr.h>
 
 /* References to section boundaries */
 extern const void __nosave_begin, __nosave_end;
@@ -48,6 +49,7 @@ void __save_processor_state(struct saved_context *ctxt)
 	rdmsrl(MSR_FS_BASE, ctxt->fs_base);
 	rdmsrl(MSR_GS_BASE, ctxt->gs_base);
 	rdmsrl(MSR_KERNEL_GS_BASE, ctxt->gs_kernel_base);
+	mtrr_save_fixed_ranges(NULL);
 
 	/*
 	 * control registers
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,7 @@ unsigned long saved_context_eflags; @@
     void __save_processor_state(struct saved_context *ctxt)
     {
+    	mtrr_save_fixed_ranges(NULL);
     	kernel_fpu_begin();
     	/*
@@ Expand Down @@