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

commit 3131ef3 upstream. The build on x86_32 currently fails after commit 9bb2ec6 (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: 9bb2ec6 ("objtool: Update Retpoline validation") Signed-off-by: Jiri Slaby <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
openbmc · Jul 23, 2022 · 67040d1 · 67040d1
1 parent 96907c5
commit 67040d1
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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>