mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-05-05 12:26:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/linux-lts: fix build on s390x

Browse Source
This commit is contained in:
Ariadne Conill 2024-08-30 16:45:53 -07:00
parent 85a033a759
commit 80a60dab22
2 changed files with 33 additions and 0 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 Normal file
View File

@ -0,0 +1,31 @@
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

@ -22,6 +22,7 @@ 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
@ -343,6 +344,7 @@ sha512sums="
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
9eb564f47906c375e7cf4bbc7d3b6d988c103c11eebc2c298b364c2804906e74968e652b3c6c071f9e572cfdba704f3f66cdefb894c084246a41d9c364f95909 lts.aarch64.config
6bec077be5d89334860ce6e5f2ad1f79101656ba0e8e8b9fa31365cb951c3c8c10ed82c7c92cb860e18b8d996f005e39826fde6efbe5d264edd249f6d8b4dfc9 lts.armv7.config
4d4a8f64eebdb9690bd9e9ed8e33b0f28424329448c176d0f8f4b08db4095708fc976624a11e037935bd864290e7b2b04f7bab92241d5cafacac2f78e3122a21 lts.x86.config