diff options
| author | Britney Fransen <brfransen@gmail.com> | 2019-03-19 20:11:10 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2019-03-19 20:11:10 (GMT) |
| commit | 73cfb83a5baecfe0529fda59ca57233d8843f783 (patch) | |
| tree | 2dba2103a6f6e43912fc645ca8b48a85ab500ad2 /abs/core/nvidia-390xx/kernel-4.16.patch | |
| parent | 7b41a9288f5d1332c8136df798bb8ca2465bc21c (diff) | |
| parent | 448cb8d0708224d78c24ce3615dc7eef44d4689b (diff) | |
| download | linhes_pkgbuild-73cfb83a5baecfe0529fda59ca57233d8843f783.zip linhes_pkgbuild-73cfb83a5baecfe0529fda59ca57233d8843f783.tar.gz linhes_pkgbuild-73cfb83a5baecfe0529fda59ca57233d8843f783.tar.bz2 | |
Merge branch 'testing'
Diffstat (limited to 'abs/core/nvidia-390xx/kernel-4.16.patch')
| -rw-r--r-- | abs/core/nvidia-390xx/kernel-4.16.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/abs/core/nvidia-390xx/kernel-4.16.patch b/abs/core/nvidia-390xx/kernel-4.16.patch new file mode 100644 index 0000000..6717281 --- /dev/null +++ b/abs/core/nvidia-390xx/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(); + }" |