Attachment #589368 for bug #693704

Lines 830-837 done: Link Here

(-)kernel/uvm/nvidia_uvm_lite.c (-3 / +7 lines)
830	#if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)	830	#if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
831	#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)	831	#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
832	int _fault(struct vm_area_struct vma, struct vm_fault vmf)	832	int _fault(struct vm_area_struct vma, struct vm_fault vmf)
833	#else	833	#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
834	int _fault(struct vm_fault *vmf)	834	int _fault(struct vm_fault *vmf)
		835	#else
		836	vm_fault_t _fault(struct vm_fault *vmf)
835	#endif	837	#endif
836	{	838	{
837	#if defined(NV_VM_FAULT_HAS_ADDRESS)	839	#if defined(NV_VM_FAULT_HAS_ADDRESS)
Lines 886-893 static struct vm_operations_struct uvmlite_vma_ops = Link Here
886	#if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)	888	#if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
887	#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)	889	#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
888	int _sigbus_fault(struct vm_area_struct vma, struct vm_fault vmf)	890	int _sigbus_fault(struct vm_area_struct vma, struct vm_fault vmf)
889	#else	891	#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
890	int _sigbus_fault(struct vm_fault *vmf)	892	int _sigbus_fault(struct vm_fault *vmf)
		893	#else
		894	vm_fault_t _sigbus_fault(struct vm_fault *vmf)
891	#endif	895	#endif
892	{	896	{
893	vmf->page = NULL;	897	vmf->page = NULL;

Lines 146-152 static const struct file_operations nv_drm_fops = { Link Here

(-)kernel/nv-drm.c (-1 / +1 lines)
146	};	146	};
147		147
148	static struct drm_driver nv_drm_driver = {	148	static struct drm_driver nv_drm_driver = {
149	#if defined(DRIVER_LEGACY)	149	#if defined(DRIVER_LEGACY) \|\| LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
150	.driver_features = DRIVER_GEM \| DRIVER_PRIME \| DRIVER_LEGACY,	150	.driver_features = DRIVER_GEM \| DRIVER_PRIME \| DRIVER_LEGACY,
151	#else	151	#else
152	.driver_features = DRIVER_GEM \| DRIVER_PRIME,	152	.driver_features = DRIVER_GEM \| DRIVER_PRIME,

Return to bug 693704