diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-01-17 22:35:35 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-01-17 22:35:35 +0000 |
| commit | 82b5d3cd6b0d6597724deef4896e93e4152e3ef2 (patch) | |
| tree | 07943ad4f3a0a3c2f664712c6cffa41acc49cb01 /arch/x86/power | |
| parent | a8a2b9ee4bec0b29d031324160b7f11af42a563a (diff) | |
| parent | ceed81a883dc43e2073ecdcfd273fa179e24df5b (diff) | |
Merge tag 'v5.4.90' into 5.4-2.3.x-imx
This is the 5.4.90 stable release
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'arch/x86/power')
| -rw-r--r-- | arch/x86/power/hibernate_asm_32.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/power/hibernate_asm_32.S b/arch/x86/power/hibernate_asm_32.S index 6fe383002125..a19ed3d23185 100644 --- a/arch/x86/power/hibernate_asm_32.S +++ b/arch/x86/power/hibernate_asm_32.S @@ -35,7 +35,7 @@ ENTRY(swsusp_arch_suspend) ret ENDPROC(swsusp_arch_suspend) -ENTRY(restore_image) +SYM_CODE_START(restore_image) /* prepare to jump to the image kernel */ movl restore_jump_address, %ebx movl restore_cr3, %ebp @@ -45,9 +45,10 @@ ENTRY(restore_image) /* jump to relocated restore code */ movl relocated_restore_code, %eax jmpl *%eax +SYM_CODE_END(restore_image) /* code below has been relocated to a safe page */ -ENTRY(core_restore_code) +SYM_CODE_START(core_restore_code) movl temp_pgt, %eax movl %eax, %cr3 @@ -77,6 +78,7 @@ copy_loop: done: jmpl *%ebx +SYM_CODE_END(core_restore_code) /* code below belongs to the image kernel */ .align PAGE_SIZE |