summarylogtreecommitdiffstats
path: root/kernel-4.16.patch
diff options
context:
space:
mode:
authorgraysky2018-05-12 15:00:17 -0400
committergraysky2018-05-12 15:00:17 -0400
commit555324c08e914ebf08df739b2e73b57b78ff1970 (patch)
tree4f77a6437f9ef1850e29e4a69c9571bdb1113fd4 /kernel-4.16.patch
downloadaur-555324c08e914ebf08df739b2e73b57b78ff1970.tar.gz
initial commit
Diffstat (limited to 'kernel-4.16.patch')
-rw-r--r--kernel-4.16.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/kernel-4.16.patch b/kernel-4.16.patch
new file mode 100644
index 000000000000..67172815ff69
--- /dev/null
+++ b/kernel-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();
+ }"