From: Andrew Morton Cc: Nick Piggin Signed-off-by: Andrew Morton --- include/linux/mm.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff -puN include/linux/mm.h~mm-merge-populate-and-nopage-into-fault-fixes-nonlinear-tidy include/linux/mm.h --- a/include/linux/mm.h~mm-merge-populate-and-nopage-into-fault-fixes-nonlinear-tidy +++ a/include/linux/mm.h @@ -216,7 +216,6 @@ struct fault_data { unsigned long address; pgoff_t pgoff; unsigned int flags; - int type; }; @@ -228,10 +227,15 @@ struct fault_data { struct vm_operations_struct { void (*open)(struct vm_area_struct * area); void (*close)(struct vm_area_struct * area); - struct page * (*fault)(struct vm_area_struct *vma, struct fault_data * fdata); - struct page * (*nopage)(struct vm_area_struct * area, unsigned long address, int *type); - unsigned long (*nopfn)(struct vm_area_struct * area, unsigned long address); - int (*populate)(struct vm_area_struct * area, unsigned long address, unsigned long len, pgprot_t prot, unsigned long pgoff, int nonblock); + struct page *(*fault)(struct vm_area_struct *vma, + struct fault_data *fdata); + struct page *(*nopage)(struct vm_area_struct *area, + unsigned long address, int *type); + unsigned long (*nopfn)(struct vm_area_struct *area, + unsigned long address); + int (*populate)(struct vm_area_struct *area, unsigned long address, + unsigned long len, pgprot_t prot, unsigned long pgoff, + int nonblock); /* notification that a previously read-only page is about to become * writable, if an error is returned it will cause a SIGBUS */ @@ -1107,8 +1111,8 @@ extern void truncate_inode_pages_range(s /* generic vm_area_ops exported for stackable file systems */ extern struct page *filemap_fault(struct vm_area_struct *, struct fault_data *); -extern struct page * __deprecated_for_modules filemap_nopage( - struct vm_area_struct *, unsigned long, int *); +extern struct page * __deprecated_for_modules +filemap_nopage(struct vm_area_struct *, unsigned long, int *); extern int __deprecated_for_modules filemap_populate(struct vm_area_struct *, unsigned long, unsigned long, pgprot_t, unsigned long, int); _