From 406f19700bdce0b1e8b3fde8e94022c76f878616 Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Mon, 21 Sep 2009 17:02:28 -0700 Subject: [PATCH] --- yaml --- r: 164424 b: refs/heads/master c: 7103ad323b1ae32bedc3267402117e2f8b45e48d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/mremap.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e0775e54e201..29f5d39cb17d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35451beecbd7c86ce3249d543594517a5fe9a0cd +refs/heads/master: 7103ad323b1ae32bedc3267402117e2f8b45e48d diff --git a/trunk/mm/mremap.c b/trunk/mm/mremap.c index 93adddecf978..20a07dba6be0 100644 --- a/trunk/mm/mremap.c +++ b/trunk/mm/mremap.c @@ -175,6 +175,7 @@ static unsigned long move_vma(struct vm_area_struct *vma, unsigned long excess = 0; unsigned long hiwater_vm; int split = 0; + int err; /* * 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, * pages recently unmapped. But leave vma->vm_flags as it was, * so KSM can come around to merge on vma and new_vma afterwards. */ - if (ksm_madvise(vma, old_addr, old_addr + old_len, - MADV_UNMERGEABLE, &vm_flags)) - return -ENOMEM; + err = ksm_madvise(vma, old_addr, old_addr + old_len, + MADV_UNMERGEABLE, &vm_flags); + if (err) + return err; new_pgoff = vma->vm_pgoff + ((old_addr - vma->vm_start) >> PAGE_SHIFT); new_vma = copy_vma(&vma, new_addr, new_len, new_pgoff);