From 8a53a9287868d2b5e6cad6f696aea75adbebf358 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 26 Aug 2018 11:44:06 +0100 Subject: cherry pick : https://bugs.archlinux.org/task/58074 --- .../nvidia-drivers-dkms/files/kernel-4.16.patch | 33 ++++++++++++++++++++++ .../nvidia-drivers-dkms-390.77.ebuild | 1 + 2 files changed, 34 insertions(+) create mode 100644 sys-kernel/nvidia-drivers-dkms/files/kernel-4.16.patch (limited to 'sys-kernel') diff --git a/sys-kernel/nvidia-drivers-dkms/files/kernel-4.16.patch b/sys-kernel/nvidia-drivers-dkms/files/kernel-4.16.patch new file mode 100644 index 00000000..67172815 --- /dev/null +++ b/sys-kernel/nvidia-drivers-dkms/files/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 ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) + #include ++#else ++#include ++#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 ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) + #include ++#else ++ #include ++#endif + void conftest_phys_to_dma(void) { + phys_to_dma(); + }" diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.77.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.77.ebuild index 92d75126..00243c36 100644 --- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.77.ebuild +++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.77.ebuild @@ -29,6 +29,7 @@ src_unpack() { src_prepare() { epatch ""${FILESDIR}"/"${P}"-conf.patch" + epatch ""${FILESDIR}"/kernel-4.16.patch" } src_install() { -- cgit v1.2.3