From: Greg Kroah-Hartman Date: Tue, 26 Jul 2022 16:44:35 +0000 (+0200) Subject: drop queue-5.15/x86-extable-provide-ex_type_default_mce_safe-and-ex_.patch-2687 X-Git-Tag: v4.9.325~39 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c72d102943e403360a9e4eb5fa1131c5e3ea6ed6;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.15/x86-extable-provide-ex_type_default_mce_safe-and-ex_.patch-2687 breaks the build --- diff --git a/queue-5.15/series b/queue-5.15/series index abbce8748aa..2a55dea1023 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -173,4 +173,3 @@ tracing-fix-return-value-of-trace_pid_write.patch um-virtio_uml-allow-probing-from-devicetree.patch um-virtio_uml-fix-broken-device-handling-in-time-tra.patch x86-uaccess-implement-macros-for-cmpxchg-on-user-add.patch-12415 -x86-extable-provide-ex_type_default_mce_safe-and-ex_.patch-2687 diff --git a/queue-5.15/x86-extable-provide-ex_type_default_mce_safe-and-ex_.patch-2687 b/queue-5.15/x86-extable-provide-ex_type_default_mce_safe-and-ex_.patch-2687 deleted file mode 100644 index 5e90a228f73..00000000000 --- a/queue-5.15/x86-extable-provide-ex_type_default_mce_safe-and-ex_.patch-2687 +++ /dev/null @@ -1,39 +0,0 @@ -From 53d65cb5022c6e46747335a85b4b638a26a9ca0d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 8 Sep 2021 15:29:19 +0200 -Subject: x86/extable: Provide EX_TYPE_DEFAULT_MCE_SAFE and - EX_TYPE_FAULT_MCE_SAFE - -From: Thomas Gleixner - -[ Upstream commit 2cadf5248b9316d3c8af876e795d61c55476f6e9 ] - -Provide exception fixup types which can be used to identify fixups which -allow in kernel #MC recovery and make them invoke the existing handlers. - -These will be used at places where #MC recovery is handled correctly by the -caller. - -Signed-off-by: Thomas Gleixner -Signed-off-by: Borislav Petkov -Link: https://lkml.kernel.org/r/20210908132525.269689153@linutronix.de -Signed-off-by: Sasha Levin ---- - arch/x86/include/asm/extable_fixup_types.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/arch/x86/include/asm/extable_fixup_types.h b/arch/x86/include/asm/extable_fixup_types.h -index 7469038de100..82c263f74971 100644 ---- a/arch/x86/include/asm/extable_fixup_types.h -+++ b/arch/x86/include/asm/extable_fixup_types.h -@@ -46,4 +46,7 @@ - #define EX_TYPE_IMM_REG 17 /* reg := (long)imm */ - #define EX_TYPE_EFAULT_REG (EX_TYPE_IMM_REG | EX_DATA_IMM(-EFAULT)) - -+#define EX_TYPE_DEFAULT_MCE_SAFE 12 -+#define EX_TYPE_FAULT_MCE_SAFE 13 -+ - #endif --- -2.35.1 -