Skip to content

Commit 3131ef3

Browse files
Jiri Slabysuryasaimadhu
authored andcommitted
x86/asm/32: Fix ANNOTATE_UNRET_SAFE use on 32-bit
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 <jslaby@suse.cz> Signed-off-by: Borislav Petkov <bp@suse.de> Link: https://lore.kernel.org/r/63e23f80-033f-f64e-7522-2816debbc367@kernel.org
1 parent b047602 commit 3131ef3

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

arch/x86/kernel/head_32.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
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>

0 commit comments

Comments
 (0)