summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-14 13:36:57 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-14 13:36:57 -0800
commit7d22286ff757586f3cdbd70ded88b98250285ec5 (patch)
treecf49b699584653535e460d5250ffe8d47712ec14 /include
parent96895199c8648db475b38aac5fe6a04ec14a49c4 (diff)
parent5f785de588735306ec4d7c875caf9d28481c8b21 (diff)
Merge git://git.kvack.org/~bcrl/aio-next
Pull aio updates from Benjamin LaHaise. * git://git.kvack.org/~bcrl/aio-next: aio: Skip timer for io_getevents if timeout=0 aio: Make it possible to remap aio ring
Diffstat (limited to 'include')
-rw-r--r--include/linux/fs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 4193a0bd99b0..8f7fc8db4679 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1518,6 +1518,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 (*open) (struct inode *, struct file *);
int (*flush) (struct file *, fl_owner_t id);
int (*release) (struct inode *, struct file *);