Merge branch 'for-linus' into for-next

1 files changed, 1 insertions, 1 deletions

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 492948ea4c9b..c7b21db7782f 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1569,7 +1569,7 @@ struct file_operations {
         long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
         long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
         int (*mmap) (struct file *, struct vm_area_struct *);
-        void (*mremap)(struct file *, struct vm_area_struct *);
+        int (*mremap)(struct file *, struct vm_area_struct *);
         int (*open) (struct inode *, struct file *);
         int (*flush) (struct file *, fl_owner_t id);
         int (*release) (struct inode *, struct file *);