[PATCH v11 09/11] x86/power/64: Adapt assembly for PIE support
From: Thomas Garnier <hidden>
Date: 2020-02-28 00:01:30
Also in:
lkml
Subsystem:
hibernation (aka software suspend, aka swsusp), the rest, x86 architecture (32-bit and 64-bit) · Maintainers:
"Rafael J. Wysocki", Linus Torvalds, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen
Change the assembly code to use only relative references of symbols for the kernel to be PIE compatible. Signed-off-by: Thomas Garnier <redacted> Acked-by: Pavel Machek <redacted> Acked-by: Rafael J. Wysocki <redacted> Reviewed-by: Kees Cook <redacted> --- arch/x86/power/hibernate_asm_64.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/power/hibernate_asm_64.S b/arch/x86/power/hibernate_asm_64.S
index 7918b8415f13..977b8ae85045 100644
--- a/arch/x86/power/hibernate_asm_64.S
+++ b/arch/x86/power/hibernate_asm_64.S@@ -23,7 +23,7 @@ #include <asm/frame.h> SYM_FUNC_START(swsusp_arch_suspend) - movq $saved_context, %rax + leaq saved_context(%rip), %rax movq %rsp, pt_regs_sp(%rax) movq %rbp, pt_regs_bp(%rax) movq %rsi, pt_regs_si(%rax)
@@ -116,7 +116,7 @@ SYM_FUNC_START(restore_registers) movq %rax, %cr4; # turn PGE back on /* We don't restore %rax, it must be 0 anyway */ - movq $saved_context, %rax + leaq saved_context(%rip), %rax movq pt_regs_sp(%rax), %rsp movq pt_regs_bp(%rax), %rbp movq pt_regs_si(%rax), %rsi
--
2.25.1.481.gfbce0eb801-goog