diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-14 13:36:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-14 13:36:57 -0800 |
| commit | 7d22286ff757586f3cdbd70ded88b98250285ec5 (patch) | |
| tree | cf49b699584653535e460d5250ffe8d47712ec14 /include | |
| parent | Merge branch 'i2c/for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux (diff) | |
| parent | aio: Skip timer for io_getevents if timeout=0 (diff) | |
| download | linux-dev-7d22286ff757586f3cdbd70ded88b98250285ec5.tar.xz linux-dev-7d22286ff757586f3cdbd70ded88b98250285ec5.zip | |
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.h | 1 |
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 *); |