diff options
author | Peter Zijlstra <peterz@infradead.org> | 2021-12-04 16:43:40 +0300 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2021-12-08 14:25:37 +0300 |
commit | f94909ceb1ed4bfdb2ada72f93236305e6d6951f (patch) | |
tree | e7368c974b829530e82f34111f1f5ab183504921 /arch/x86/power/hibernate_asm_32.S | |
parent | 22da5a07c75e1104caf6a42f189c97b83d070073 (diff) | |
download | linux-f94909ceb1ed4bfdb2ada72f93236305e6d6951f.tar.xz |
x86: Prepare asm files for straight-line-speculation
Replace all ret/retq instructions with RET in preparation of making
RET a macro. Since AS is case insensitive it's a big no-op without
RET defined.
find arch/x86/ -name \*.S | while read file
do
sed -i 's/\<ret[q]*\>/RET/' $file
done
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20211204134907.905503893@infradead.org
Diffstat (limited to 'arch/x86/power/hibernate_asm_32.S')
-rw-r--r-- | arch/x86/power/hibernate_asm_32.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/power/hibernate_asm_32.S b/arch/x86/power/hibernate_asm_32.S index 8786653ad3c0..5606a15cf9a1 100644 --- a/arch/x86/power/hibernate_asm_32.S +++ b/arch/x86/power/hibernate_asm_32.S @@ -32,7 +32,7 @@ SYM_FUNC_START(swsusp_arch_suspend) FRAME_BEGIN call swsusp_save FRAME_END - ret + RET SYM_FUNC_END(swsusp_arch_suspend) SYM_CODE_START(restore_image) @@ -108,5 +108,5 @@ SYM_FUNC_START(restore_registers) /* tell the hibernation core that we've just restored the memory */ movl %eax, in_suspend - ret + RET SYM_FUNC_END(restore_registers) |