From 0b66f3a3edeaad5269e71f4f46d76b8857f40d86 Mon Sep 17 00:00:00 2001 From: Paolo Pisati Date: Wed, 22 Apr 2020 14:09:47 +0000 Subject: [PATCH] UBUNTU: SAUCE: fix FTBFS in machine_real_restart() (focal-amd64)ppisati@kathleen:~/linux$ make -j128 DESCEND objtool CALL scripts/atomic/check-atomics.sh CALL scripts/checksyscalls.sh CHK include/generated/compile.h CC arch/x86/kernel/reboot.o CHK kernel/kheaders_data.tar.xz arch/x86/kernel/reboot.o: warning: objtool: machine_real_restart()+0x63: retpoline_safe hint not an indirect jump/call make[2]: *** [scripts/Makefile.build:275: arch/x86/kernel/reboot.o] Error 255 make[2]: *** Deleting file 'arch/x86/kernel/reboot.o' make[1]: *** [scripts/Makefile.build:496: arch/x86/kernel] Error 2 make: *** [Makefile:1734: arch/x86] Error 2 make: *** Waiting for unfinished jobs.... Signed-off-by: Paolo Pisati --- arch/x86/kernel/reboot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 2592f7b46694..e4536dd1a91d 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -119,11 +119,11 @@ void __noreturn machine_real_restart(unsigned int type) /* Jump to the identity-mapped low memory code */ #ifdef CONFIG_X86_32 - asm volatile(ANNOTATE_RETPOLINE_SAFE "jmpl *%0" : : + asm volatile("jmpl *%0" : : "rm" (real_mode_header->machine_real_restart_asm), "a" (type)); #else - asm volatile(ANNOTATE_RETPOLINE_SAFE "ljmpl *%0" : : + asm volatile("ljmpl *%0" : : "m" (real_mode_header->machine_real_restart_asm), "D" (type)); #endif