History

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

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.

Jiri Slaby committed 4 years ago

Commit 3131ef31 parent b0476021 file · +1 −0Browse files

Unified · Split

arch/x86/kernel/head_32.S+1−0
@@ -23,6 +23,7 @@ · 22 unmodified lines
2323 #include <asm/cpufeatures.h>
2424 #include <asm/percpu.h>
2525 #include <asm/nops.h>
26+#include <asm/nospec-branch.h>
2627 #include <asm/bootparam.h>
2728 #include <asm/export.h>
2829 #include <asm/pgtable_32.h>