diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-21 16:31:22 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-21 16:31:22 +0200 |
| commit | ab2a0e0d135490729e384c1826d118f92e88cae8 (patch) | |
| tree | 58ab1e9e5d549feac9bf3beacbb6942f50d0bed9 /arch/x86/kernel/acpi/realmode/wakeup.S | |
| parent | 09dd9b39abf85b8fae3ea105a81825478dd227b6 (diff) | |
| parent | 2f3ab04a47c9b5e7c93400601e8f69bef0fa184a (diff) | |
Merge branch 'next-samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
Diffstat (limited to 'arch/x86/kernel/acpi/realmode/wakeup.S')
| -rw-r--r-- | arch/x86/kernel/acpi/realmode/wakeup.S | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/realmode/wakeup.S b/arch/x86/kernel/acpi/realmode/wakeup.S index ead21b663117..b4fd836e4053 100644 --- a/arch/x86/kernel/acpi/realmode/wakeup.S +++ b/arch/x86/kernel/acpi/realmode/wakeup.S @@ -28,6 +28,8 @@ pmode_cr3: .long 0 /* Saved %cr3 */ pmode_cr4: .long 0 /* Saved %cr4 */ pmode_efer: .quad 0 /* Saved EFER */ pmode_gdt: .quad 0 +pmode_misc_en: .quad 0 /* Saved MISC_ENABLE MSR */ +pmode_behavior: .long 0 /* Wakeup behavior flags */ realmode_flags: .long 0 real_magic: .long 0 trampoline_segment: .word 0 @@ -91,6 +93,18 @@ wakeup_code: /* Call the C code */ calll main + /* Restore MISC_ENABLE before entering protected mode, in case + BIOS decided to clear XD_DISABLE during S3. */ + movl pmode_behavior, %eax + btl $WAKEUP_BEHAVIOR_RESTORE_MISC_ENABLE, %eax + jnc 1f + + movl pmode_misc_en, %eax + movl pmode_misc_en + 4, %edx + movl $MSR_IA32_MISC_ENABLE, %ecx + wrmsr +1: + /* Do any other stuff... */ #ifndef CONFIG_64BIT |