The following commit has been merged into the locking/core branch of tip: Commit-ID: ace1a98519270c586c0d4179419292df67441cd1 Gitweb: https://git.kernel.org/tip/ace1a98519270c586c0d4179419292df67441cd1 Author: Borislav Petkov <bp@xxxxxxx> AuthorDate: Wed, 23 Mar 2022 23:24:12 +01:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Mon, 04 Apr 2022 10:13:25 +02:00 x86/mm: Force-inline __phys_addr_nodebug() Fix: vmlinux.o: warning: objtool: __sev_es_nmi_complete()+0x8b: call to __phys_addr_nodebug() leaves .noinstr.text section Signed-off-by: Borislav Petkov <bp@xxxxxxx> Acked-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20220324183607.31717-4-bp@xxxxxxxxx --- arch/x86/include/asm/page_64.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h index e9c8629..baa7045 100644 --- a/arch/x86/include/asm/page_64.h +++ b/arch/x86/include/asm/page_64.h @@ -16,7 +16,7 @@ extern unsigned long page_offset_base; extern unsigned long vmalloc_base; extern unsigned long vmemmap_base; -static inline unsigned long __phys_addr_nodebug(unsigned long x) +static __always_inline unsigned long __phys_addr_nodebug(unsigned long x) { unsigned long y = x - __START_KERNEL_map;
![]() |