The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 3131ef39fb03bbde237d0b8260445898f3dfda5b
Gitweb: https://git.kernel.org/tip/3131ef39fb03bbde237d0b8260445898f3dfda5b
Author: Jiri Slaby <jslaby@xxxxxxx>
AuthorDate: Wed, 13 Jul 2022 11:50:46 +02:00
Committer: Borislav Petkov <bp@xxxxxxx>
CommitterDate: Wed, 13 Jul 2022 12:43:26 +02:00
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.
Fixes: 9bb2ec608a20 ("objtool: Update Retpoline validation")
Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Link: https://lore.kernel.org/r/63e23f80-033f-f64e-7522-2816debbc367@xxxxxxxxxx
---
arch/x86/kernel/head_32.S | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index eb8656b..9b7acc9 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>
|