diff options
author | Jeroen Roovers <jer@gentoo.org> | 2014-10-19 14:28:58 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2014-10-19 14:28:58 +0000 |
commit | e6a0c810cfb0f52b1b1281ae40729ed56405c93b (patch) | |
tree | ff812dcdd1917dea1ec88a2775c98aadd63a04b8 /x11-drivers/nvidia-drivers/files | |
parent | version bump (diff) | |
download | gentoo-2-e6a0c810cfb0f52b1b1281ae40729ed56405c93b.tar.gz gentoo-2-e6a0c810cfb0f52b1b1281ae40729ed56405c93b.tar.bz2 gentoo-2-e6a0c810cfb0f52b1b1281ae40729ed56405c93b.zip |
Add new constify patch (bug #482784).
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'x11-drivers/nvidia-drivers/files')
-rw-r--r-- | x11-drivers/nvidia-drivers/files/nvidia-drivers-337.12-pax-constify.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-337.12-pax-constify.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-337.12-pax-constify.patch new file mode 100644 index 000000000000..0ec9edf99cc8 --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-337.12-pax-constify.patch @@ -0,0 +1,25 @@ +--- a/kernel/uvm/nvidia_uvm_common.c ++++ b/kernel/uvm/nvidia_uvm_common.c +@@ -95,7 +95,6 @@ static RM_STATUS uvmnext_gpu_event_stop_ + #endif // NVIDIA_UVM_NEXT_ENABLED + + static dev_t g_uvmBaseDev; +-struct UvmOpsUvmEvents g_exportedUvmOps; + + // TODO: This would be easier if RM allowed for multiple registrations, since we + // could register UVM-Lite and UVM-Next separately (bug 1372835). +@@ -147,9 +146,11 @@ static RM_STATUS uvmSetupGpuProvider(voi + RM_STATUS status = RM_OK; + + #ifdef NVIDIA_UVM_RM_ENABLED +- g_exportedUvmOps.startDevice = uvm_gpu_event_start_device; +- g_exportedUvmOps.stopDevice = uvm_gpu_event_stop_device; +- g_exportedUvmOps.isrTopHalf = uvmnext_isr_top_half; ++ static struct UvmOpsUvmEvents g_exportedUvmOps = { ++ .startDevice = uvm_gpu_event_start_device, ++ .stopDevice = uvm_gpu_event_stop_device, ++ .isrTopHalf = uvmnext_isr_top_half, ++ }; + + // call RM to exchange the function pointers. + status = nvUvmInterfaceRegisterUvmCallbacks(&g_exportedUvmOps); |