From c256f05636183f3238fa9606389b54f9209b9e97 Mon Sep 17 00:00:00 2001
From: Juergen Gross <jgross@suse.com>
Date: Jun 03 2025 05:27:21 +0000
Subject: - blacklist.conf: add 75ad02318af2 ("Xen/swiotlb: mark xen_swiotlb_fixup() __init")
- Delete patches.suse/Xen-swiotlb-mark-xen_swiotlb_fixup-__init.patch.
---
diff --git a/blacklist.conf b/blacklist.conf
index 5376e4a..f811019 100644
--- a/blacklist.conf
+++ b/blacklist.conf
@@ -834,3 +834,4 @@ c99b38c412343053e9af187e595793c8805bb9b8 # needed for audio offload, not a fix
7a2369b74abf76cd3e54c45b30f6addb497f831b # defconfig change
882b25af265de8e05c66f72b9a29f6047102958f # ! SMP
4496e1c1354bd4837bcc1414f6e1a4d042857903 # crash dump config change
+75ad02318af2e4ae669e26a79f001bd5e1f97472 # not applicable
diff --git a/patches.suse/Xen-swiotlb-mark-xen_swiotlb_fixup-__init.patch b/patches.suse/Xen-swiotlb-mark-xen_swiotlb_fixup-__init.patch
deleted file mode 100644
index 6821999..0000000
--- a/patches.suse/Xen-swiotlb-mark-xen_swiotlb_fixup-__init.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Patch-mainline: v6.14-rc3
-Git-commit: 75ad02318af2e4ae669e26a79f001bd5e1f97472
-References: git-fixes
-From: Jan Beulich <jbeulich@suse.com>
-Date: Wed, 12 Feb 2025 16:14:38 +0100
-Subject: [PATCH] Xen/swiotlb: mark xen_swiotlb_fixup() __init
-
-It's sole user (pci_xen_swiotlb_init()) is __init, too.
-
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
-
-Message-ID: <e1198286-99ec-41c1-b5ad-e04e285836c9@suse.com>
-Signed-off-by: Juergen Gross <jgross@suse.com>
----
- drivers/xen/swiotlb-xen.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
-index 26c62e0d34e9..1f65795cf5d7 100644
---- a/drivers/xen/swiotlb-xen.c
-+++ b/drivers/xen/swiotlb-xen.c
-@@ -113,7 +113,7 @@ static struct io_tlb_pool *xen_swiotlb_find_pool(struct device *dev,
- }
-
- #ifdef CONFIG_X86
--int xen_swiotlb_fixup(void *buf, unsigned long nslabs)
-+int __init xen_swiotlb_fixup(void *buf, unsigned long nslabs)
- {
- int rc;
- unsigned int order = get_order(IO_TLB_SEGSIZE << IO_TLB_SHIFT);
---
-2.43.0
-
diff --git a/series.conf b/series.conf
index c385577..60b03b4 100644
--- a/series.conf
+++ b/series.conf
@@ -30681,7 +30681,6 @@
patches.suse/drm-i915-selftests-avoid-using-uninitialized-context.patch
patches.suse/xen-swiotlb-relax-alignment-requirements.patch
patches.suse/x86-xen-allow-larger-contiguous-memory-regions-in-PV.patch
- patches.suse/Xen-swiotlb-mark-xen_swiotlb_fixup-__init.patch
patches.suse/arm64-Handle-.ARM.attributes-section-in-linker-scripts.patch
patches.suse/arm64-cacheinfo-Avoid-out-of-bounds-write-to-cacheinfo-array.patch
patches.suse/arm64-amu-Delay-allocating-cpumask-for-AMU-FIE-support.patch