From: Jiri Slaby <jslaby@suse.cz>
Date: Wed, 13 Jul 2022 09:50:46 +0000 (+0200)
Subject: x86/asm/32: Fix ANNOTATE_UNRET_SAFE use on 32-bit
X-Git-Tag: v5.10.133~14
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ecc0d92a9f6cc3f74b67d2c9887d0c800018e661;p=users%2Fdwmw2%2Flinux.git

x86/asm/32: Fix ANNOTATE_UNRET_SAFE use on 32-bit

commit 3131ef39fb03bbde237d0b8260445898f3dfda5b upstream.

The build on x86_32 currently fails after commit

  9bb2ec608a20 (objtool: Update Retpoline validation)

with:

  arch/x86/kernel/../../x86/xen/xen-head.S:35: Error: no such instruction: `annotate_unret_safe'

ANNOTATE_UNRET_SAFE is defined in nospec-branch.h. And head_32.S is
missing this include. Fix this.

Fixes: 9bb2ec608a20 ("objtool: Update Retpoline validation")
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/63e23f80-033f-f64e-7522-2816debbc367@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index 9b2b1ac7e8c96..3f1691b89231f 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -23,6 +23,7 @@
 #include <asm/cpufeatures.h>
 #include <asm/percpu.h>
 #include <asm/nops.h>
+#include <asm/nospec-branch.h>
 #include <asm/bootparam.h>
 #include <asm/export.h>
 #include <asm/pgtable_32.h>