git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86, suspend: Restore MISC_ENABLE MSR in realmode wakeup
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
acpi
/
sleep.c
diff --git
a/arch/x86/kernel/acpi/sleep.c
b/arch/x86/kernel/acpi/sleep.c
index
18a857b
..
103b6ab
100644
(file)
--- a/
arch/x86/kernel/acpi/sleep.c
+++ b/
arch/x86/kernel/acpi/sleep.c
@@
-77,6
+77,12
@@
int acpi_suspend_lowlevel(void)
header->pmode_cr0 = read_cr0();
header->pmode_cr4 = read_cr4_safe();
header->pmode_cr0 = read_cr0();
header->pmode_cr4 = read_cr4_safe();
+ header->pmode_behavior = 0;
+ if (!rdmsr_safe(MSR_IA32_MISC_ENABLE,
+ &header->pmode_misc_en_low,
+ &header->pmode_misc_en_high))
+ header->pmode_behavior |=
+ (1 << WAKEUP_BEHAVIOR_RESTORE_MISC_ENABLE);
header->realmode_flags = acpi_realmode_flags;
header->real_magic = 0x12345678;
header->realmode_flags = acpi_realmode_flags;
header->real_magic = 0x12345678;