diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-29 23:12:54 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-29 23:12:54 +0300 |
| commit | e148d0f85cc3e9f2802c7fcf451098c6d19b535b (patch) | |
| tree | 974d3f0f598eabaa5623ffdab19de1459a8edb43 /arch/x86 | |
| parent | 6453dbdda30428a3c56568c96fe70ea3612f07e2 (diff) | |
| parent | 4ce827b4cc58bec7952591b96cce2b28553e4d5b (diff) | |
| download | linux-e148d0f85cc3e9f2802c7fcf451098c6d19b535b.tar.xz | |
Merge branch 'pm-sleep'
* pm-sleep:
x86/power/64: Fix hibernation return address corruption
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/power/hibernate_asm_64.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/power/hibernate_asm_64.S b/arch/x86/power/hibernate_asm_64.S index 3177c2bc26f6..8eee0e9c93f0 100644 --- a/arch/x86/power/hibernate_asm_64.S +++ b/arch/x86/power/hibernate_asm_64.S @@ -24,7 +24,6 @@ #include <asm/frame.h> ENTRY(swsusp_arch_suspend) - FRAME_BEGIN movq $saved_context, %rax movq %rsp, pt_regs_sp(%rax) movq %rbp, pt_regs_bp(%rax) @@ -48,6 +47,7 @@ ENTRY(swsusp_arch_suspend) movq %cr3, %rax movq %rax, restore_cr3(%rip) + FRAME_BEGIN call swsusp_save FRAME_END ret @@ -104,7 +104,6 @@ ENTRY(core_restore_code) /* code below belongs to the image kernel */ .align PAGE_SIZE ENTRY(restore_registers) - FRAME_BEGIN /* go back to the original page tables */ movq %r9, %cr3 @@ -145,6 +144,5 @@ ENTRY(restore_registers) /* tell the hibernation core that we've just restored the memory */ movq %rax, in_suspend(%rip) - FRAME_END ret ENDPROC(restore_registers) |