Changes to your Nvidia 361.18 patch for Nvidia 361.28
Posted: Tue Feb 09, 2016 11:34 pm
Hello,
I could not get an interdiff to work so here are the patches for the 2 files in your 361.18 patch I needed to change for 361.28. They allow me to bring up X11, firefox and thunderbird under Linux kernel 4.3.5 and grsecurity-3.1-4.3.5-201602070910.patch
diff -urp NVIDIA-Linux-x86_64-361.28-no-compat32/kernel/common/inc/nv-linux.h NVIDIA-Linux-x86_64-361.28-no-compat32-custom/kernel/common/inc/nv-linux.h
--- NVIDIA-Linux-x86_64-361.28-no-compat32/kernel/common/inc/nv-linux.h 2016-02-03 17:31:51.000000000 -0500
+++ NVIDIA-Linux-x86_64-361.28-no-compat32-custom/kernel/common/inc/nv-linux.h 2016-02-09 21:42:20.000000000 -0500
@@ -1342,10 +1342,15 @@ extern void *nvidia_stack_t_cache;
#if (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5)
#define NV_KMEM_CACHE_CREATE_FULL(name, size, align, flags, ctor) \
kmem_cache_create(name, size, align, flags, ctor)
+#define NV_KMEM_CACHE_CREATE_USERCOPY(name, type) \
+ kmem_cache_create(name, sizeof(type), 0, SLAB_USERCOPY, NULL)
#else
#define NV_KMEM_CACHE_CREATE_FULL(name, size, align, flags, ctor) \
kmem_cache_create(name, size, align, flags, ctor, NULL)
+#define NV_KMEM_CACHE_CREATE_USERCOPY(name, type) \
+ kmem_cache_create(name, sizeof(type), 0, SLAB_USERCOPY, NULL, \
+ NULL)
#endif
#define NV_KMEM_CACHE_CREATE(name, type) \
diff -urp NVIDIA-Linux-x86_64-361.28-no-compat32/kernel/nvidia-uvm/uvm8_mmu.h NVIDIA-Linux-x86_64-361.28-no-compat32-custom/kernel/nvidia-uvm/uvm8_mmu.h
--- NVIDIA-Linux-x86_64-361.28-no-compat32/kernel/nvidia-uvm/uvm8_mmu.h 2016-02-03 17:32:32.000000000 -0500
+++ NVIDIA-Linux-x86_64-361.28-no-compat32-custom/kernel/nvidia-uvm/uvm8_mmu.h 2016-02-09 21:42:20.000000000 -0500
@@ -24,7 +24,6 @@
#ifndef __UVM8_MMU_H__
#define __UVM8_MMU_H__
-#include "uvm8_forward_decl.h"
#include "uvm8_pmm_gpu.h"
#include "uvmtypes.h"
#include "uvm_common.h"
I could not get an interdiff to work so here are the patches for the 2 files in your 361.18 patch I needed to change for 361.28. They allow me to bring up X11, firefox and thunderbird under Linux kernel 4.3.5 and grsecurity-3.1-4.3.5-201602070910.patch
diff -urp NVIDIA-Linux-x86_64-361.28-no-compat32/kernel/common/inc/nv-linux.h NVIDIA-Linux-x86_64-361.28-no-compat32-custom/kernel/common/inc/nv-linux.h
--- NVIDIA-Linux-x86_64-361.28-no-compat32/kernel/common/inc/nv-linux.h 2016-02-03 17:31:51.000000000 -0500
+++ NVIDIA-Linux-x86_64-361.28-no-compat32-custom/kernel/common/inc/nv-linux.h 2016-02-09 21:42:20.000000000 -0500
@@ -1342,10 +1342,15 @@ extern void *nvidia_stack_t_cache;
#if (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5)
#define NV_KMEM_CACHE_CREATE_FULL(name, size, align, flags, ctor) \
kmem_cache_create(name, size, align, flags, ctor)
+#define NV_KMEM_CACHE_CREATE_USERCOPY(name, type) \
+ kmem_cache_create(name, sizeof(type), 0, SLAB_USERCOPY, NULL)
#else
#define NV_KMEM_CACHE_CREATE_FULL(name, size, align, flags, ctor) \
kmem_cache_create(name, size, align, flags, ctor, NULL)
+#define NV_KMEM_CACHE_CREATE_USERCOPY(name, type) \
+ kmem_cache_create(name, sizeof(type), 0, SLAB_USERCOPY, NULL, \
+ NULL)
#endif
#define NV_KMEM_CACHE_CREATE(name, type) \
diff -urp NVIDIA-Linux-x86_64-361.28-no-compat32/kernel/nvidia-uvm/uvm8_mmu.h NVIDIA-Linux-x86_64-361.28-no-compat32-custom/kernel/nvidia-uvm/uvm8_mmu.h
--- NVIDIA-Linux-x86_64-361.28-no-compat32/kernel/nvidia-uvm/uvm8_mmu.h 2016-02-03 17:32:32.000000000 -0500
+++ NVIDIA-Linux-x86_64-361.28-no-compat32-custom/kernel/nvidia-uvm/uvm8_mmu.h 2016-02-09 21:42:20.000000000 -0500
@@ -24,7 +24,6 @@
#ifndef __UVM8_MMU_H__
#define __UVM8_MMU_H__
-#include "uvm8_forward_decl.h"
#include "uvm8_pmm_gpu.h"
#include "uvmtypes.h"
#include "uvm_common.h"