summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathon Fernyhough2021-01-09 14:02:58 +0000
committerJonathon Fernyhough2021-01-09 14:02:58 +0000
commit34ff4061d331f3edeff868c58cdb51be9288a496 (patch)
tree750008f35eba9b8c66250e0db0d4c3e2e9d0a4c3
parent1d9aa3164932ba6844bfdefe1a4efa22a8f6b524 (diff)
downloadaur-34ff4061d331f3edeff868c58cdb51be9288a496.tar.gz
Update kernel-4.16.patch
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rw-r--r--kernel-4.16.patch6
3 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6a1b853be74e..58cfff335eb6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,7 +13,7 @@ pkgbase = nvidia-390xx
source = https://us.download.nvidia.com/XFree86/Linux-x86_64/390.141/NVIDIA-Linux-x86_64-390.141-no-compat32.run
source = kernel-4.16.patch
b2sums = fae33e5fcd8f0429f163ad40e58a07c42ff47260bd1b0f56989d6147d63294c475f33ddc02f06a16eaf8c8ea9f74a98dbcb32b5322c68661331ebf7dfe976770
- b2sums = 1d21307640a3844752c92e8344518daf6ad62d846689bebe6eed4dcadbf7b2e742862f5c17c0faee7256662cb75e62e124d59e5a5617e87324e1f0658f2b748d
+ b2sums = 16480a3df51248b5adf3a3349f602f96cd830b5364c0a1c142a53099ed1e881f727026fe36b837b76f20aef7e7bf606f52c1af28f1eec7cc8bf39a571243a4ba
pkgname = nvidia-390xx
pkgdesc = NVIDIA drivers for linux, 390xx legacy branch
diff --git a/PKGBUILD b/PKGBUILD
index d9942eb9ac1c..6e94e5368350 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
source=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
'kernel-4.16.patch')
b2sums=('fae33e5fcd8f0429f163ad40e58a07c42ff47260bd1b0f56989d6147d63294c475f33ddc02f06a16eaf8c8ea9f74a98dbcb32b5322c68661331ebf7dfe976770'
- '1d21307640a3844752c92e8344518daf6ad62d846689bebe6eed4dcadbf7b2e742862f5c17c0faee7256662cb75e62e124d59e5a5617e87324e1f0658f2b748d')
+ '16480a3df51248b5adf3a3349f602f96cd830b5364c0a1c142a53099ed1e881f727026fe36b837b76f20aef7e7bf606f52c1af28f1eec7cc8bf39a571243a4ba')
prepare() {
sh "${_pkg}.run" --extract-only
diff --git a/kernel-4.16.patch b/kernel-4.16.patch
index 67172815ff69..3bd6e3081a0e 100644
--- a/kernel-4.16.patch
+++ b/kernel-4.16.patch
@@ -11,14 +11,14 @@ index 10fc418..22ef968 100644
+#else
+#include <linux/dma-direct.h>
+#endif
- #endif
- #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+ #if defined(NV_LINUX_DMA_MAP_OPS_H_PRESENT)
+ #include <linux/dma-map-ops.h>
diff --git a/kernel/conftest.sh b/kernel/conftest.sh
index b23dbb4..42dc576 100755
--- a/kernel/conftest.sh
+++ b/kernel/conftest.sh
-@@ -1906,7 +1906,12 @@ compile_test() {
+@@ -2068,7 +2068,12 @@ compile_test() {
# Determine if the phys_to_dma function is present.
#
CODE="