diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-14 22:36:57 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-14 22:36:57 +0100 |
| commit | 7d22286ff757586f3cdbd70ded88b98250285ec5 (patch) | |
| tree | cf49b699584653535e460d5250ffe8d47712ec14 /mm | |
| parent | Merge branch 'i2c/for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | aio: Skip timer for io_getevents if timeout=0 (diff) | |
| download | linux-7d22286ff757586f3cdbd70ded88b98250285ec5.tar.xz linux-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 'mm')
| -rw-r--r-- | mm/mremap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/mremap.c b/mm/mremap.c index 84aa36f9f308..17fa018f5f39 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -288,7 +288,8 @@ static unsigned long move_vma(struct vm_area_struct *vma, old_len = new_len; old_addr = new_addr; new_addr = -ENOMEM; - } + } else if (vma->vm_file && vma->vm_file->f_op->mremap) + vma->vm_file->f_op->mremap(vma->vm_file, new_vma); /* Conceal VM_ACCOUNT so old reservation is not undone */ if (vm_flags & VM_ACCOUNT) { |