diff options
| -rw-r--r-- | .SRCINFO | 25 | ||||
| -rw-r--r-- | 0003-Partially-revert-swiotlb-remove-various-exports.patch | 29 | ||||
| -rw-r--r-- | PKGBUILD | 18 |
3 files changed, 52 insertions, 20 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sun Apr 8 07:22:05 UTC 2018 +# Sun Apr 8 07:25:12 UTC 2018 pkgbase = linux-pf pkgdesc = Linux kernel and modules with the pf-kernel patch (uksm, PDS). - pkgver = 4.15.6 + pkgver = 4.16.1 pkgrel = 1 url = https://pfactum.github.io/pf-kernel arch = i686 @@ -16,23 +16,22 @@ pkgbase = linux-pf makedepends = kmod makedepends = elfutils options = !strip - source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.15.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.tar.xz source = config.i686 source = config.x86_64 source = linux.preset - source = https://github.com/pfactum/pf-kernel/compare/v4.15...v4.15-pf6.diff + source = https://github.com/pfactum/pf-kernel/compare/v4.16...v4.16-pf1.diff source = 90-linux.hook source = 60-linux.hook - sha256sums = 5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769 + source = 0003-Partially-revert-swiotlb-remove-various-exports.patch + sha256sums = 63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9 sha256sums = 102d518779dc312af35faf7e07ff01df3c04521d40d8757fc4e8eba9c595c395 sha256sums = f38927db126ec7141ea2dd70cabb2ef378552672b31db4ab621493928497abd7 sha256sums = 82d660caa11db0cd34fd550a049d7296b4a9dcd28f2a50c81418066d6e598864 - sha256sums = dc2d9346c657d291b4688f1af4433e6bf4d46101c4f2b849fc9cea5affda26e4 + sha256sums = dfa5b3fa715f269eb215585f496536ba2ea8d33992ae13a4190c4df7b1dce7f7 sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919 sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 - sha256sums = b20e25656c9423591afd0325fe26320f50bc3421ff204acbfe5dd88ffb3866fe - sha256sums = 68575230693b374eb68e6100e719c71a196db57fe0ac79ddae02fe72b404e09e - sha256sums = b21406c060cf601f879528cfa1b83f524c44d8ecd99689c331a7c6326653d0be + sha256sums = d365ce80dab359d5277bd2f8568cad50a30ab269f222ed1bb12b8d74571e24a6 pkgname = linux-pf pkgdesc = Linux kernel and modules with the pf-kernel patch (uksm, PDS) @@ -47,7 +46,7 @@ pkgname = linux-pf optdepends = nvidia-pf: NVIDIA drivers for linux-pf optdepends = nvidia-beta-all: NVIDIA drivers for all installed kernels optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed. Useful for make localmodconfig. - provides = linux-pf=4.15.6 + provides = linux-pf=4.16.1 provides = linux-tomoyo conflicts = linux-pf conflicts = kernel26-pf @@ -56,13 +55,13 @@ pkgname = linux-pf pkgname = linux-pf-headers pkgdesc = Header files and scripts for building modules for linux-pf kernel. depends = linux-pf - provides = linux-pf-headers=4.15.6 + provides = linux-pf-headers=4.16.1 conflicts = linux-pf-headers pkgname = linux-pf-preset-default pkgdesc = Linux-pf default preset install = linux.install - depends = linux-pf=4.15.6 - provides = linux-pf-preset=4.15.6 + depends = linux-pf=4.16.1 + provides = linux-pf-preset=4.16.1 backup = etc/mkinitcpio.d/linux-pf.preset diff --git a/0003-Partially-revert-swiotlb-remove-various-exports.patch b/0003-Partially-revert-swiotlb-remove-various-exports.patch new file mode 100644 index 000000000000..ed4e028821f6 --- /dev/null +++ b/0003-Partially-revert-swiotlb-remove-various-exports.patch @@ -0,0 +1,29 @@ +From b7c4c2b34e729c1f6f617a8e2aa1dec3e28fdf5c Mon Sep 17 00:00:00 2001 +Message-Id: <b7c4c2b34e729c1f6f617a8e2aa1dec3e28fdf5c.1523024759.git.jan.steffens@gmail.com> +In-Reply-To: <ed80ff656462322e0bc7813d736800321097e10a.1523024759.git.jan.steffens@gmail.com> +References: <ed80ff656462322e0bc7813d736800321097e10a.1523024759.git.jan.steffens@gmail.com> +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Fri, 6 Apr 2018 16:19:38 +0200 +Subject: [PATCH 3/3] Partially revert "swiotlb: remove various exports" + +This partially reverts commit 4bd89ed39b2ab8dc4ac4b6c59b07d420b0213bec. +The proprietary NVIDIA driver needs one of the exports. +--- + lib/swiotlb.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/swiotlb.c b/lib/swiotlb.c +index c43ec2271469..77d699f14af7 100644 +--- a/lib/swiotlb.c ++++ b/lib/swiotlb.c +@@ -1016,6 +1016,7 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems, + } + return nelems; + } ++EXPORT_SYMBOL(swiotlb_map_sg_attrs); + + /* + * Unmap a set of streaming mode DMA translations. Again, cpu read rules +-- +2.17.0 + @@ -4,13 +4,13 @@ # Some lines from kernel26-bfs and kernel26-ck # Credits to respective maintainers _major=4 -_minor=15 +_minor=16 #_patchlevel=0 #_subversion=1 _basekernel=${_major}.${_minor} _srcname=linux-${_major}.${_minor} pkgbase=linux-pf -_pfrel=6 +_pfrel=1 _kernelname=-pf _pfpatchhome="https://github.com/pfactum/pf-kernel/compare" _pfpatchname="v$_major.$_minor...v$_major.$_minor-pf$_pfrel.diff" @@ -83,6 +83,7 @@ source=("https://www.kernel.org/pub/linux/kernel/v${_major}.x/linux-${_basekerne "${_pfpatchhome}/${_pfpatchname}" # the -pf patchset "90-linux.hook" "60-linux.hook" + '0003-Partially-revert-swiotlb-remove-various-exports.patch' ) # 'cx23885_move_CI_AC_registration_to_a_separate_function.patch' @@ -106,6 +107,11 @@ prepare() { #patch -Np1 -i ../0003-ssb-Do-not-disable-PCI-host-on-non-Mips.patch # end + + + # NVIDIA driver compat + patch -Np1 -i ../0003-Partially-revert-swiotlb-remove-various-exports.patch + # end linux-ARCH patches # fix ci invalid PC card inserted issue hopefully @@ -677,14 +683,12 @@ package_linux-pf-preset-default() pkgdesc="Linux kernel and modules with the pf-kernel patch (uksm, PDS)." # makepkg -g >>PKGBUILD -sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769' +sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9' '102d518779dc312af35faf7e07ff01df3c04521d40d8757fc4e8eba9c595c395' 'f38927db126ec7141ea2dd70cabb2ef378552672b31db4ab621493928497abd7' '82d660caa11db0cd34fd550a049d7296b4a9dcd28f2a50c81418066d6e598864' - 'dc2d9346c657d291b4688f1af4433e6bf4d46101c4f2b849fc9cea5affda26e4' + 'dfa5b3fa715f269eb215585f496536ba2ea8d33992ae13a4190c4df7b1dce7f7' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' - 'b20e25656c9423591afd0325fe26320f50bc3421ff204acbfe5dd88ffb3866fe' - '68575230693b374eb68e6100e719c71a196db57fe0ac79ddae02fe72b404e09e' - 'b21406c060cf601f879528cfa1b83f524c44d8ecd99689c331a7c6326653d0be') + 'd365ce80dab359d5277bd2f8568cad50a30ab269f222ed1bb12b8d74571e24a6') |