X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=arch%2Fi386%2Fpower%2Fcpu.c;h=e6517915fe3e19ebc1a74cc7c34ac6be9eb616b9;hb=a03a3e287b119c7bcbcff1d68f81864ce33b1ad2;hp=1f1572692e0b7eeaa9c318a5051c98f4d8de2402;hpb=23fd07750a789a66fe88cf173d52a18f1a387da4;p=mv-sheeva.git

diff --git a/arch/i386/power/cpu.c b/arch/i386/power/cpu.c
index 1f1572692e0..e6517915fe3 100644
--- a/arch/i386/power/cpu.c
+++ b/arch/i386/power/cpu.c
@@ -10,6 +10,8 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/suspend.h>
+#include <asm/mtrr.h>
+#include <asm/mce.h>
 
 static struct saved_context saved_context;
 
@@ -92,7 +94,7 @@ void __restore_processor_state(struct saved_context *ctxt)
 	write_cr4(ctxt->cr4);
 	write_cr3(ctxt->cr3);
 	write_cr2(ctxt->cr2);
-	write_cr2(ctxt->cr0);
+	write_cr0(ctxt->cr0);
 
 	/*
 	 * now restore the descriptor tables to their proper values
@@ -118,6 +120,7 @@ void __restore_processor_state(struct saved_context *ctxt)
 	fix_processor_context();
 	do_fpu_end();
 	mtrr_ap_init();
+	mcheck_init(&boot_cpu_data);
 }
 
 void restore_processor_state(void)