Author: hselasky
Date: Sun Feb 25 10:34:47 2018
New Revision: 329971
URL: https://svnweb.freebsd.org/changeset/base/329971
Log:
MFC r329515:
Make the vm_fault structure in the LinuxKPI compatible with
newer versions of the Linux kernel. No functional change.
Submitted by: Johannes Lundberg <johal...@gmail.com>
Sponsored by: Mellanox Technologies
Sponsored by: Limelight Networks
Modified:
stable/11/sys/compat/linuxkpi/common/include/linux/mm.h
stable/11/sys/compat/linuxkpi/common/src/linux_compat.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/compat/linuxkpi/common/include/linux/mm.h
==============================================================================
--- stable/11/sys/compat/linuxkpi/common/include/linux/mm.h Sun Feb 25
10:33:55 2018 (r329970)
+++ stable/11/sys/compat/linuxkpi/common/include/linux/mm.h Sun Feb 25
10:34:47 2018 (r329971)
@@ -118,8 +118,13 @@ struct vm_area_struct {
struct vm_fault {
unsigned int flags;
pgoff_t pgoff;
- void *virtual_address; /* user-space address */
+ union {
+ /* user-space address */
+ void *virtual_address;
+ unsigned long address;
+ };
struct page *page;
+ struct vm_area_struct *vma;
};
struct vm_operations_struct {
Modified: stable/11/sys/compat/linuxkpi/common/src/linux_compat.c
==============================================================================
--- stable/11/sys/compat/linuxkpi/common/src/linux_compat.c Sun Feb 25
10:33:55 2018 (r329970)
+++ stable/11/sys/compat/linuxkpi/common/src/linux_compat.c Sun Feb 25
10:34:47 2018 (r329971)
@@ -538,6 +538,7 @@ linux_cdev_pager_populate(vm_object_t vm_obj, vm_pinde
vmf.flags = (fault_type & VM_PROT_WRITE) ? FAULT_FLAG_WRITE : 0;
vmf.pgoff = 0;
vmf.page = NULL;
+ vmf.vma = vmap;
vmap->vm_pfn_count = 0;
vmap->vm_pfn_pcount = &vmap->vm_pfn_count;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
