aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/mremap.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/mm/mremap.c b/mm/mremap.c
index 93adddecf978..20a07dba6be0 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -175,6 +175,7 @@ static unsigned long move_vma(struct vm_area_struct *vma,
175 unsigned long excess = 0; 175 unsigned long excess = 0;
176 unsigned long hiwater_vm; 176 unsigned long hiwater_vm;
177 int split = 0; 177 int split = 0;
178 int err;
178 179
179 /* 180 /*
180 * We'd prefer to avoid failure later on in do_munmap: 181 * We'd prefer to avoid failure later on in do_munmap:
@@ -190,9 +191,10 @@ static unsigned long move_vma(struct vm_area_struct *vma,
190 * pages recently unmapped. But leave vma->vm_flags as it was, 191 * pages recently unmapped. But leave vma->vm_flags as it was,
191 * so KSM can come around to merge on vma and new_vma afterwards. 192 * so KSM can come around to merge on vma and new_vma afterwards.
192 */ 193 */
193 if (ksm_madvise(vma, old_addr, old_addr + old_len, 194 err = ksm_madvise(vma, old_addr, old_addr + old_len,
194 MADV_UNMERGEABLE, &vm_flags)) 195 MADV_UNMERGEABLE, &vm_flags);
195 return -ENOMEM; 196 if (err)
197 return err;
196 198
197 new_pgoff = vma->vm_pgoff + ((old_addr - vma->vm_start) >> PAGE_SHIFT); 199 new_pgoff = vma->vm_pgoff + ((old_addr - vma->vm_start) >> PAGE_SHIFT);
198 new_vma = copy_vma(&vma, new_addr, new_len, new_pgoff); 200 new_vma = copy_vma(&vma, new_addr, new_len, new_pgoff);