summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/suspend_32.h
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2010-06-08 02:32:49 +0400
committerRafael J. Wysocki <rjw@sisk.pl>2010-06-08 02:32:49 +0400
commit85a0e7539781dad4bfcffd98e72fa9f130f4e40d (patch)
treec64b6526319b3e9c5a8c8592ca96988a3726b9ad /arch/x86/include/asm/suspend_32.h
parent386f40c86d6c8d5b717ef20620af1a750d0dacb4 (diff)
downloadlinux-85a0e7539781dad4bfcffd98e72fa9f130f4e40d.tar.xz
PM / x86: Save/restore MISC_ENABLE register
Save/restore MISC_ENABLE register on suspend/resume. This fixes OOPS (invalid opcode) on resume from STR on Asus P4P800-VM, which wakes up with MWAIT disabled. Fixes https://bugzilla.kernel.org/show_bug.cgi?id=15385 Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Tested-by: Alan Stern <stern@rowland.harvard.edu> Acked-by: H. Peter Anvin <hpa@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'arch/x86/include/asm/suspend_32.h')
-rw-r--r--arch/x86/include/asm/suspend_32.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/suspend_32.h b/arch/x86/include/asm/suspend_32.h
index 48dcfa62ea07..fd921c3a6841 100644
--- a/arch/x86/include/asm/suspend_32.h
+++ b/arch/x86/include/asm/suspend_32.h
@@ -15,6 +15,8 @@ static inline int arch_prepare_suspend(void) { return 0; }
struct saved_context {
u16 es, fs, gs, ss;
unsigned long cr0, cr2, cr3, cr4;
+ u64 misc_enable;
+ bool misc_enable_saved;
struct desc_ptr gdt;
struct desc_ptr idt;
u16 ldt;