git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
i386
/
power
/
cpu.c
diff --git
a/arch/i386/power/cpu.c
b/arch/i386/power/cpu.c
index
50a0bef
..
2c15500
100644
(file)
--- a/
arch/i386/power/cpu.c
+++ b/
arch/i386/power/cpu.c
@@
-7,9
+7,10
@@
* Copyright (c) 2001 Patrick Mochel <mochel@osdl.org>
*/
* Copyright (c) 2001 Patrick Mochel <mochel@osdl.org>
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/suspend.h>
#include <linux/module.h>
#include <linux/suspend.h>
+#include <asm/mtrr.h>
+#include <asm/mce.h>
static struct saved_context saved_context;
static struct saved_context saved_context;
@@
-25,8
+26,8
@@
void __save_processor_state(struct saved_context *ctxt)
/*
* descriptor tables
*/
/*
* descriptor tables
*/
- store_gdt(&ctxt->gdt
_limit
);
- store_idt(&ctxt->idt
_limit
);
+ store_gdt(&ctxt->gdt);
+ store_idt(&ctxt->idt);
store_tr(ctxt->tr);
/*
store_tr(ctxt->tr);
/*
@@
-92,14
+93,14
@@
void __restore_processor_state(struct saved_context *ctxt)
write_cr4(ctxt->cr4);
write_cr3(ctxt->cr3);
write_cr2(ctxt->cr2);
write_cr4(ctxt->cr4);
write_cr3(ctxt->cr3);
write_cr2(ctxt->cr2);
- write_cr
2
(ctxt->cr0);
+ write_cr
0
(ctxt->cr0);
/*
* now restore the descriptor tables to their proper values
* ltr is done i fix_processor_context().
*/
/*
* now restore the descriptor tables to their proper values
* ltr is done i fix_processor_context().
*/
- load_gdt(&ctxt->gdt
_limit
);
- load_idt(&ctxt->idt
_limit
);
+ load_gdt(&ctxt->gdt);
+ load_idt(&ctxt->idt);
/*
* segment registers
/*
* segment registers