diff options
Diffstat (limited to 'debian/patches/bugfix/x86/retbleed/0056-x86-asm-32-fix-annotate_unret_safe-use-on-32-bit.patch')
| -rw-r--r-- | debian/patches/bugfix/x86/retbleed/0056-x86-asm-32-fix-annotate_unret_safe-use-on-32-bit.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/debian/patches/bugfix/x86/retbleed/0056-x86-asm-32-fix-annotate_unret_safe-use-on-32-bit.patch b/debian/patches/bugfix/x86/retbleed/0056-x86-asm-32-fix-annotate_unret_safe-use-on-32-bit.patch deleted file mode 100644 index 2ba7abb8a..000000000 --- a/debian/patches/bugfix/x86/retbleed/0056-x86-asm-32-fix-annotate_unret_safe-use-on-32-bit.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 -Origin: https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit?id=3131ef39fb03bbde237d0b8260445898f3dfda5b - -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 ---- - 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 eb8656bac99b..9b7acc9c7874 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> |