summarylogtreecommitdiffstats
path: root/kernel-5.1.patch
diff options
context:
space:
mode:
Diffstat (limited to 'kernel-5.1.patch')
-rw-r--r--kernel-5.1.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/kernel-5.1.patch b/kernel-5.1.patch
new file mode 100644
index 000000000000..19e27a86f13a
--- /dev/null
+++ b/kernel-5.1.patch
@@ -0,0 +1,43 @@
+diff --git kernel/uvm/nvidia_uvm_lite.c kernel/uvm/nvidia_uvm_lite.c
+index 65b9a4d..f5ea5d7 100644
+--- kernel/uvm/nvidia_uvm_lite.c
++++ kernel/uvm/nvidia_uvm_lite.c
+@@ -830,8 +830,10 @@ done:
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+-#else
+-int _fault(struct vm_fault *vmf)
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
++int _fault(struct vm_fault *vmf)
++#else
++vm_fault_t _fault(struct vm_fault *vmf)
+ #endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+@@ -886,8 +888,10 @@ static struct vm_operations_struct uvmlite_vma_ops =
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+-#else
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
+ int _sigbus_fault(struct vm_fault *vmf)
++#else
++vm_fault_t _sigbus_fault(struct vm_fault *vmf)
+ #endif
+ {
+ vmf->page = NULL;
+diff --git kernel/nv-drm.c kernel/nv-drm.c
+index 122ba7d..1be5733 100644
+--- kernel/nv-drm.c
++++ kernel/nv-drm.c
+@@ -146,7 +146,7 @@ static const struct file_operations nv_drm_fops = {
+ };
+
+ static struct drm_driver nv_drm_driver = {
+-#if defined(DRIVER_LEGACY)
++#if defined(DRIVER_LEGACY) || LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
+ .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_LEGACY,
+ #else
+ .driver_features = DRIVER_GEM | DRIVER_PRIME,
+