From b09d2b826736fa46c2819aad64396a842ec91ee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 2 Jan 2018 03:25:24 +0100 Subject: [PATCH] nvidia: fix the fix again (no patch for i686) --- .../nvidia-x86-uvm8_va_block-linux_4_14_9.patch | 17 ----------------- srcpkgs/nvidia/template | 7 ++----- 2 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 srcpkgs/nvidia/files/nvidia-x86-uvm8_va_block-linux_4_14_9.patch diff --git a/srcpkgs/nvidia/files/nvidia-x86-uvm8_va_block-linux_4_14_9.patch b/srcpkgs/nvidia/files/nvidia-x86-uvm8_va_block-linux_4_14_9.patch deleted file mode 100644 index cc9c29e0cf..0000000000 --- a/srcpkgs/nvidia/files/nvidia-x86-uvm8_va_block-linux_4_14_9.patch +++ /dev/null @@ -1,17 +0,0 @@ -Since linux-4.14.9 there has been some kernel headers reordering. -Fix that issue by including linux/sched/task_stack.h for kernels -newer than 4.14.9. - ---- NVIDIA-Linux-x86-384.98/kernel/nvidia-uvm/uvm8_va_block.c 2017-10-27 01:19:54.000000000 +0200 -+++ NVIDIA-Linux-x86-384.98/kernel/nvidia-uvm/uvm8_va_block.c 2018-01-02 02:50:05.260588964 +0100 -@@ -36,6 +36,10 @@ - #include "uvm8_perf_prefetch.h" - #include "uvm8_mem.h" - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,9) -+#include -+#endif -+ - typedef enum - { - BLOCK_PTE_OP_MAP, diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template index db381ab966..f40431e0d9 100644 --- a/srcpkgs/nvidia/template +++ b/srcpkgs/nvidia/template @@ -39,14 +39,11 @@ do_extract() { ./${_pkg}.run --extract-only rm -f ${_pkg}.run # - if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then - cp ${FILESDIR}/nvidia-x86-uvm8_va_block-linux_4_14_9.patch \ - nvidia-uvm8_va_block-linux_4_14_9.patch - else + if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then cp ${FILESDIR}/nvidia-x86_64-uvm8_va_block-linux_4_14_9.patch \ nvidia-uvm8_va_block-linux_4_14_9.patch + patch -p0 < nvidia-uvm8_va_block-linux_4_14_9.patch fi - patch -p0 < nvidia-uvm8_va_block-linux_4_14_9.patch } pre_install() {