Commit e148d0f8 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-sleep' 

* pm-sleep:
  x86/power/64: Fix hibernation return address corruption
parents 6453dbdd 4ce827b4

arch/x86/power/hibernate_asm_64.S

+1 −3
Original line number Original line Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <asm/frame.h>

#include <asm/frame.h>





ENTRY(swsusp_arch_suspend)

ENTRY(swsusp_arch_suspend)

	FRAME_BEGIN

	movq	$saved_context, %rax

	movq	$saved_context, %rax

	movq	%rsp, pt_regs_sp(%rax)

	movq	%rsp, pt_regs_sp(%rax)

	movq	%rbp, pt_regs_bp(%rax)

	movq	%rbp, pt_regs_bp(%rax)
@@ -48,6 +47,7 @@ ENTRY(swsusp_arch_suspend) 
	movq	%cr3, %rax

	movq	%cr3, %rax

	movq	%rax, restore_cr3(%rip)

	movq	%rax, restore_cr3(%rip)





	FRAME_BEGIN

	call swsusp_save

	call swsusp_save

	FRAME_END

	FRAME_END

	ret

	ret
@@ -104,7 +104,6 @@ ENTRY(core_restore_code) 
	 /* code below belongs to the image kernel */

	 /* code below belongs to the image kernel */

	.align PAGE_SIZE

	.align PAGE_SIZE

ENTRY(restore_registers)

ENTRY(restore_registers)

	FRAME_BEGIN

	/* go back to the original page tables */

	/* go back to the original page tables */

	movq    %r9, %cr3

	movq    %r9, %cr3
@@ -145,6 +144,5 @@ ENTRY(restore_registers) 
	/* tell the hibernation core that we've just restored the memory */

	/* tell the hibernation core that we've just restored the memory */

	movq	%rax, in_suspend(%rip)

	movq	%rax, in_suspend(%rip)





	FRAME_END

	ret

	ret

ENDPROC(restore_registers)
 
ENDPROC(restore_registers)