From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 22 Apr 2025 08:45:09 +0000 (+0200)
Subject: 6.1-stable patches
X-Git-Tag: v6.1.135~70
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3279f841605158c8f4f84d55c1626397065deb6f;p=thirdparty%2Fkernel%2Fstable-queue.git

6.1-stable patches

added patches:
	revert-xen-swiotlb-mark-xen_swiotlb_fixup-__init.patch
---

diff --git a/queue-6.1/revert-xen-swiotlb-mark-xen_swiotlb_fixup-__init.patch b/queue-6.1/revert-xen-swiotlb-mark-xen_swiotlb_fixup-__init.patch
new file mode 100644
index 0000000000..b5b7f4c104
--- /dev/null
+++ b/queue-6.1/revert-xen-swiotlb-mark-xen_swiotlb_fixup-__init.patch
@@ -0,0 +1,33 @@
+From d7222f81855689cc8c54c8f859e9cfeaf747681d Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Tue, 22 Apr 2025 10:42:58 +0200
+Subject: Revert "Xen/swiotlb: mark xen_swiotlb_fixup() __init"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 1a95cff6e15945e8bc7a4e4cec9f9b85f0fb08e7 which is
+commit 75ad02318af2e4ae669e26a79f001bd5e1f97472 upstream.
+
+Turns out it causes build warnings and might break systems.
+
+Link: https://lore.kernel.org/r/20250407181218.GA737271@ax162
+Reported-by: Nathan Chancellor <nathan@kernel.org>
+Reported-by: Salvatore Bonaccorso <carnil@debian.org>
+Cc: Juergen Gross <jgross@suse.com>
+Cc: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/xen/swiotlb-xen.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/xen/swiotlb-xen.c
++++ b/drivers/xen/swiotlb-xen.c
+@@ -112,7 +112,7 @@ static int is_xen_swiotlb_buffer(struct
+ }
+ 
+ #ifdef CONFIG_X86
+-int __init xen_swiotlb_fixup(void *buf, unsigned long nslabs)
++int xen_swiotlb_fixup(void *buf, unsigned long nslabs)
+ {
+ 	int rc;
+ 	unsigned int order = get_order(IO_TLB_SEGSIZE << IO_TLB_SHIFT);
diff --git a/queue-6.1/series b/queue-6.1/series
index 37027ca2e8..c5c1fa5bad 100644
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -271,3 +271,4 @@ loongarch-eliminate-superfluous-get_numa_distances_cnt.patch
 btrfs-fix-qgroup-reserve-leaks-in-cow_file_range.patch
 btrfs-zoned-fix-zone-activation-with-missing-devices.patch
 btrfs-zoned-fix-zone-finishing-with-missing-devices.patch
+revert-xen-swiotlb-mark-xen_swiotlb_fixup-__init.patch