6.1-stable patches

added patches:
	purgatory-fix-disabling-debug-info.patch

diff --git a/queue-6.1/purgatory-fix-disabling-debug-info.patch b/queue-6.1/purgatory-fix-disabling-debug-info.patch
new file mode 100644 (file)
index 0000000..26fc133
--- /dev/null
+++ b/queue-6.1/purgatory-fix-disabling-debug-info.patch
@@ -0,0 +1,51 @@
+From d83806c4c0cccc0d6d3c3581a11983a9c186a138 Mon Sep 17 00:00:00 2001
+From: Alyssa Ross <hi@alyssa.is>
+Date: Sun, 26 Mar 2023 18:21:21 +0000
+Subject: purgatory: fix disabling debug info
+
+From: Alyssa Ross <hi@alyssa.is>
+
+commit d83806c4c0cccc0d6d3c3581a11983a9c186a138 upstream.
+
+Since 32ef9e5054ec, -Wa,-gdwarf-2 is no longer used in KBUILD_AFLAGS.
+Instead, it includes -g, the appropriate -gdwarf-* flag, and also the
+-Wa versions of both of those if building with Clang and GNU as.  As a
+result, debug info was being generated for the purgatory objects, even
+though the intention was that it not be.
+
+Fixes: 32ef9e5054ec ("Makefile.debug: re-enable debug info for .S files")
+Signed-off-by: Alyssa Ross <hi@alyssa.is>
+Cc: stable@vger.kernel.org
+Acked-by: Nick Desaulniers <ndesaulniers@google.com>
+Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/riscv/purgatory/Makefile |    4 +---
+ arch/x86/purgatory/Makefile   |    3 +--
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+--- a/arch/riscv/purgatory/Makefile
++++ b/arch/riscv/purgatory/Makefile
+@@ -74,9 +74,7 @@ CFLAGS_string.o                      += $(PURGATORY_CFLAGS)
+ CFLAGS_REMOVE_ctype.o         += $(PURGATORY_CFLAGS_REMOVE)
+ CFLAGS_ctype.o                        += $(PURGATORY_CFLAGS)
+ 
+-AFLAGS_REMOVE_entry.o         += -Wa,-gdwarf-2
+-AFLAGS_REMOVE_memcpy.o                += -Wa,-gdwarf-2
+-AFLAGS_REMOVE_memset.o                += -Wa,-gdwarf-2
++asflags-remove-y              += $(foreach x, -g -gdwarf-4 -gdwarf-5, $(x) -Wa,$(x))
+ 
+ $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE
+               $(call if_changed,ld)
+--- a/arch/x86/purgatory/Makefile
++++ b/arch/x86/purgatory/Makefile
+@@ -69,8 +69,7 @@ CFLAGS_sha256.o                      += $(PURGATORY_CFLAGS)
+ CFLAGS_REMOVE_string.o                += $(PURGATORY_CFLAGS_REMOVE)
+ CFLAGS_string.o                       += $(PURGATORY_CFLAGS)
+ 
+-AFLAGS_REMOVE_setup-x86_$(BITS).o     += -Wa,-gdwarf-2
+-AFLAGS_REMOVE_entry64.o                       += -Wa,-gdwarf-2
++asflags-remove-y              += $(foreach x, -g -gdwarf-4 -gdwarf-5, $(x) -Wa,$(x))
+ 
+ $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE
+               $(call if_changed,ld)

diff --git a/queue-6.1/series b/queue-6.1/series
index e2e2eae3dfd60b4e2cefeb97c05515540a8f3f04..71a3fa53c8fa9ff8a7e61abbad94ee805662ffc8 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -83,3 +83,4 @@ kvm-arm64-make-vcpu-flag-updates-non-preemptible.patch
 kvm-arm64-fix-buffer-overflow-in-kvm_arm_set_fw_reg.patch
 mips-define-runtime_discard_exit-in-ld-script.patch
 fuse-always-revalidate-rename-target-dentry.patch
+purgatory-fix-disabling-debug-info.patch