mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-05 21:37:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "main/linux-lts: fix build on s390x"

Browse Source 
Problem appears to be fixed upstream in 6.6.49

This reverts commit f0bad21401.
This commit is contained in:
Natanael Copa 2024-09-04 15:39:26 +02:00
parent af354b79f3
commit d2f45803a5
2 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
main/linux-lts/0006-s390-pci-follow-alloc_pages-in-dma_map_ops-name-change.patch
View File

@ -1,31 +0,0 @@
From de1b3fcfe10db99467d4029e821d92bab6e443c0 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@ariadne.space>
Date: Fri, 30 Aug 2024 16:09:31 -0700
Subject: [PATCH] s390/pci: follow alloc_pages in dma_map_ops name change
In commit 983e6b2636f0099dbac1874c9e885bbe1cf2df05, alloc_pages was renamed to
alloc_pages_op, but this was not changed for the s390 PCI implementation, most
likely due to upstream changes in the s390 PCI implementation which moved it
to using the generic IOMMU implementation after Linux 6.6 was released.
Signed-off-by: Ariadne Conill <ariadne@ariadne.space>
---
arch/s390/pci/pci_dma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/s390/pci/pci_dma.c b/arch/s390/pci/pci_dma.c
index 99209085c75b..ce0f2990cb04 100644
--- a/arch/s390/pci/pci_dma.c
+++ b/arch/s390/pci/pci_dma.c
@@ -721,7 +721,7 @@ const struct dma_map_ops s390_pci_dma_ops = {
.unmap_page = s390_dma_unmap_pages,
.mmap = dma_common_mmap,
.get_sgtable = dma_common_get_sgtable,
- .alloc_pages = dma_common_alloc_pages,
+ .alloc_pages_op = dma_common_alloc_pages,
.free_pages = dma_common_free_pages,
/* dma_supported is unconditionally true without a callback */
};
--
2.46.0

2
main/linux-lts/APKBUILD
View File

@ -19,7 +19,6 @@ source="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver
0003-kexec-add-kexec_load_disabled-boot-option.patch
0004-objtool-respect-AWK-setting.patch
0005-powerpc-config-defang-gcc-check-for-stack-protector-.patch
0006-s390-pci-follow-alloc_pages-in-dma_map_ops-name-change.patch
lts.aarch64.config
lts.armv7.config
@ -357,7 +356,6 @@ c06b797aeba45359c887443ea5d4290a835bb598e4363b3b3ac9c840e0de7507738ffd265ba632dd
75f232b6becee7d36d360ffaf2aaa837d13518f9ec620ca159bcb2a0e98eb18a77631406a9b44244ea0164a7ed59fad583823909681e9b894a012f9d13365b69 0003-kexec-add-kexec_load_disabled-boot-option.patch
2956050bb332411d00a285e9656618f2e34b631492bbc19bef54d83a6e91b8531f4e18830b9313cfe52fbf8a8ca6fb76cf55b3ddd146ca3b977046cf2fd10cad 0004-objtool-respect-AWK-setting.patch
4b16f15b47b5e5835b926126e39723f519290469517875cfb2d2b857a93ad1344f0d1ba4b255289e20f4da9c867647526b344f752981cee0a48c51577badac3f 0005-powerpc-config-defang-gcc-check-for-stack-protector-.patch
c6a5afcac3fc89e2011cc734d33e94e732fed138659f460c1c4714bd8137f2ccd3bb8327f28082c2a4f3d23df7d56894420507c54e0abcd2ba84abc0930271c8 0006-s390-pci-follow-alloc_pages-in-dma_map_ops-name-change.patch
a8286ac0cbff0736ab7d5503a19034b11d69d1faa84316bef69087102a009c27b9f54daf9d55d55112e8eef4f239d1dd3a34fe1b55c1aa078ca638a85e0ded1b lts.aarch64.config
2fd7ce3f044f72718b51c7db81bb0f720630a8a4164b97036bfe1a0816efc6903ca83f580543ea4bdca6031d912af9138c44f90722ceff8d5e928412ad23a609 lts.armv7.config
b2534172f8eeb14edb5855c59e806ce07fdfbc1a5a4fe206dd037f17aa21b894d927c1cdcf7c87bb364efd491bb226e3ee21e7f46d26a1afc05f9385260985eb lts.x86.config