summarylogtreecommitdiffstats
path: root/linux-4.16.patch
diff options
context:
space:
mode:
authorDaniel Bermond2018-09-21 03:25:41 +0000
committerDaniel Bermond2018-09-21 03:25:41 +0000
commitbcb6e7dfdeb2ee155687c34788d87b3d5b89a69c (patch)
tree7821e97d68c9a86147f8cb3e760a5e821724ef6a /linux-4.16.patch
parent0bbc132684326da1afbe086844bb37ba826907fc (diff)
downloadaur-bcb6e7dfdeb2ee155687c34788d87b3d5b89a69c.tar.gz
Updated to version 410.57
Diffstat (limited to 'linux-4.16.patch')
-rw-r--r--linux-4.16.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/linux-4.16.patch b/linux-4.16.patch
new file mode 100644
index 000000000000..67172815ff69
--- /dev/null
+++ b/linux-4.16.patch
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
++++ b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include <linux/pagemap.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include <linux/dma-mapping.h>
++#else
++#include <linux/dma-direct.h>
++#endif
+ #endif
+
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+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() {
+ # Determine if the phys_to_dma function is present.
+ #
+ CODE="
++ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include <linux/dma-mapping.h>
++#else
++ #include <linux/dma-direct.h>
++#endif
+ void conftest_phys_to_dma(void) {
+ phys_to_dma();
+ }"