summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2021-01-06 15:36:21 +0100
committerThomas Gleixner <tglx@linutronix.de>2021-01-12 21:10:58 +0100
commita1d5c98aac33a5a0004ecf88905dcc261c52f988 (patch)
treeddcffdf3688a17b1f3697189490b540c8bfc7102 /arch
parentx86/entry: Fix noinstr fail (diff)
downloadlinux-a1d5c98aac33a5a0004ecf88905dcc261c52f988.tar.xz
linux-a1d5c98aac33a5a0004ecf88905dcc261c52f988.zip
x86/sev: Fix nonistr violation
When the compiler fails to inline, it violates nonisntr: vmlinux.o: warning: objtool: __sev_es_nmi_complete()+0xc7: call to sev_es_wr_ghcb_msr() leaves .noinstr.text section Fixes: 4ca68e023b11 ("x86/sev-es: Handle NMI State") Reported-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/20210106144017.532902065@infradead.org
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/sev-es.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/sev-es.c b/arch/x86/kernel/sev-es.c
index ab31c34ba508..84c1821819af 100644
--- a/arch/x86/kernel/sev-es.c
+++ b/arch/x86/kernel/sev-es.c
@@ -225,7 +225,7 @@ static inline u64 sev_es_rd_ghcb_msr(void)
return __rdmsr(MSR_AMD64_SEV_ES_GHCB);
}
-static inline void sev_es_wr_ghcb_msr(u64 val)
+static __always_inline void sev_es_wr_ghcb_msr(u64 val)
{
u32 low, high;