diff options
| author | Vladimir Kondratyev <wulf@FreeBSD.org> | 2021-09-29 20:26:32 +0000 |
|---|---|---|
| committer | Vladimir Kondratyev <wulf@FreeBSD.org> | 2021-09-29 20:26:32 +0000 |
| commit | 062f15004f4e92cd984bf59ec95c189a9d998013 (patch) | |
| tree | 1bfe3959169c6bca2c9bee2b1c6058a3102e4247 /sys/compat/linuxkpi/common | |
| parent | 5ca1f3f5e3a322ddb598295825bdc1d831ba71d5 (diff) | |
| download | src-062f15004f4e92cd984bf59ec95c189a9d998013.tar.gz src-062f15004f4e92cd984bf59ec95c189a9d998013.zip | |
LinuxKPI: Remove vma argument from fault method of vm_operations_struct
It is removed from Linux since 4.11.
In FreeBSD it results in several #ifdefs in drm-kmod.
Reviewed by: emaste, hselasky, manu
Differential revision: https://reviews.freebsd.org/D32169
Diffstat (limited to 'sys/compat/linuxkpi/common')
| -rw-r--r-- | sys/compat/linuxkpi/common/include/linux/mm.h | 2 | ||||
| -rw-r--r-- | sys/compat/linuxkpi/common/src/linux_compat.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/compat/linuxkpi/common/include/linux/mm.h b/sys/compat/linuxkpi/common/include/linux/mm.h index 0ee9dd58616a..ec88f39ac410 100644 --- a/sys/compat/linuxkpi/common/include/linux/mm.h +++ b/sys/compat/linuxkpi/common/include/linux/mm.h @@ -137,7 +137,7 @@ struct vm_fault { struct vm_operations_struct { void (*open) (struct vm_area_struct *); void (*close) (struct vm_area_struct *); - int (*fault) (struct vm_area_struct *, struct vm_fault *); + int (*fault) (struct vm_fault *); int (*access) (struct vm_area_struct *, unsigned long, void *, int, int); }; diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index 103d7ab0c60b..279f7131fc57 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -560,11 +560,11 @@ linux_cdev_pager_populate(vm_object_t vm_obj, vm_pindex_t pidx, int fault_type, vmap->vm_pfn_pcount = &vmap->vm_pfn_count; vmap->vm_obj = vm_obj; - err = vmap->vm_ops->fault(vmap, &vmf); + err = vmap->vm_ops->fault(&vmf); while (vmap->vm_pfn_count == 0 && err == VM_FAULT_NOPAGE) { kern_yield(PRI_USER); - err = vmap->vm_ops->fault(vmap, &vmf); + err = vmap->vm_ops->fault(&vmf); } } |