From dfd47298d1bc26f7f807520aacecdb2e848b38ab Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 14 Jul 2022 11:36:36 +0200
Subject: [PATCH] 5.15-stable patches

added patches:
	x86-asm-32-fix-annotate_unret_safe-use-on-32-bit.patch
---
 queue-5.15/series                             |  1 +
 ...ix-annotate_unret_safe-use-on-32-bit.patch | 39 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 queue-5.15/x86-asm-32-fix-annotate_unret_safe-use-on-32-bit.patch

diff --git a/queue-5.15/series b/queue-5.15/series
index b1058aeeb5c..0ac85d068c2 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -77,3 +77,4 @@ x86-kexec-disable-ret-on-kexec.patch
 x86-speculation-disable-rrsba-behavior.patch
 x86-static_call-serialize-__static_call_fixup-properly.patch
 x86-xen-fix-initialisation-in-hypercall_page-after-rethunk.patch
+x86-asm-32-fix-annotate_unret_safe-use-on-32-bit.patch
diff --git a/queue-5.15/x86-asm-32-fix-annotate_unret_safe-use-on-32-bit.patch b/queue-5.15/x86-asm-32-fix-annotate_unret_safe-use-on-32-bit.patch
new file mode 100644
index 00000000000..2f4b60d55b0
--- /dev/null
+++ b/queue-5.15/x86-asm-32-fix-annotate_unret_safe-use-on-32-bit.patch
@@ -0,0 +1,39 @@
+From 3131ef39fb03bbde237d0b8260445898f3dfda5b Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Wed, 13 Jul 2022 11:50:46 +0200
+Subject: x86/asm/32: Fix ANNOTATE_UNRET_SAFE use on 32-bit
+
+From: Jiri Slaby <jslaby@suse.cz>
+
+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>
+---
+ arch/x86/kernel/head_32.S |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- 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>
-- 
2.47.3