|
Line
Link Here
|
| 0 |
-- a/kernel/uvm/nvidia_uvm_lite.c |
0 |
++ b/kernel/uvm/nvidia_uvm_lite.c |
|
Lines 818-824
Link Here
|
| 818 |
} |
818 |
} |
| 819 |
|
819 |
|
| 820 |
#if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT) |
820 |
#if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT) |
|
|
821 |
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) |
| 822 |
int _fault(struct vm_fault *vmf) |
| 823 |
#else |
| 821 |
int _fault(struct vm_area_struct *vma, struct vm_fault *vmf) |
824 |
int _fault(struct vm_area_struct *vma, struct vm_fault *vmf) |
|
|
825 |
#endif |
| 822 |
{ |
826 |
{ |
| 823 |
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) |
827 |
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) |
| 824 |
unsigned long vaddr = (unsigned long)vmf->virtual_address; |
828 |
unsigned long vaddr = (unsigned long)vmf->virtual_address; |
|
Lines 828-834
Link Here
|
| 828 |
struct page *page = NULL; |
832 |
struct page *page = NULL; |
| 829 |
int retval; |
833 |
int retval; |
| 830 |
|
834 |
|
|
|
835 |
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) |
| 836 |
retval = _fault_common(NULL, vaddr, &page, vmf->flags); |
| 837 |
#else |
| 831 |
retval = _fault_common(vma, vaddr, &page, vmf->flags); |
838 |
retval = _fault_common(vma, vaddr, &page, vmf->flags); |
|
|
839 |
#endif |
| 832 |
|
840 |
|
| 833 |
vmf->page = page; |
841 |
vmf->page = page; |
| 834 |
|
842 |
|
|
Lines 866-872
Link Here
|
| 866 |
// it's dealing with anonymous mapping (see handle_pte_fault). |
874 |
// it's dealing with anonymous mapping (see handle_pte_fault). |
| 867 |
// |
875 |
// |
| 868 |
#if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT) |
876 |
#if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT) |
|
|
877 |
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) |
| 878 |
int _sigbus_fault(struct vm_fault *vmf) |
| 879 |
#else |
| 869 |
int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf) |
880 |
int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf) |
|
|
881 |
#endif |
| 870 |
{ |
882 |
{ |
| 871 |
vmf->page = NULL; |
883 |
vmf->page = NULL; |
| 872 |
return VM_FAULT_SIGBUS; |
884 |
return VM_FAULT_SIGBUS; |
