From: Jan Beulich Date: Mon, 16 Dec 2019 10:40:03 +0000 (+0100) Subject: x86/entry/64: Add instruction suffix to SYSRET X-Git-Tag: block-5.6-2020-02-05~57^2~1 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=b2b1d94cdfd4e906d3936dab2850096a4a0c2017;p=linux-block.git x86/entry/64: Add instruction suffix to SYSRET ignore_sysret() contains an unsuffixed SYSRET instruction. gas correctly interprets this as SYSRETL, but leaving it up to gas to guess when there is no register operand that implies a size is bad practice, and upstream gas is likely to warn about this in the future. Use SYSRETL explicitly. This does not change the assembled output. Signed-off-by: Jan Beulich Signed-off-by: Borislav Petkov Acked-by: Andy Lutomirski Link: https://lkml.kernel.org/r/038a7c35-062b-a285-c6d2-653b56585844@suse.com --- diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 76942cbd95a1..f2bb91e87877 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -1728,7 +1728,7 @@ SYM_CODE_END(nmi) SYM_CODE_START(ignore_sysret) UNWIND_HINT_EMPTY mov $-ENOSYS, %eax - sysret + sysretl SYM_CODE_END(ignore_sysret) #endif