jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nvidia: fix the fix again (no patch for i686)

Browse source
This commit is contained in:
Jürgen Buchmüller 2018-01-02 03:25:24 +01:00
parent e2aa8b2960
commit b09d2b8267
2 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
srcpkgs/nvidia/files/nvidia-x86-uvm8_va_block-linux_4_14_9.patch
View file

@ -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 <linux/sched/task_stack.h>
+#endif
+
typedef enum
{
BLOCK_PTE_OP_MAP,

7
srcpkgs/nvidia/template
View file

@ -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() {