From: Andrea Arcangeli <aarcange@redhat.com>
Date: Wed, 5 Oct 2011 00:43:02 +0000 (+1100)
Subject: thp-mremap-support-and-tlb-optimization-fix-fix-fix
X-Git-Tag: next-20111006~1^2~175
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=77129ab1da89c8a6e05c5732be66ce6522c1fbb2;p=karo-tx-linux.git

thp-mremap-support-and-tlb-optimization-fix-fix-fix

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index fffab174f3e7..6b072bdccf81 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1064,7 +1064,7 @@ int move_huge_pmd(struct vm_area_struct *vma, struct vm_area_struct *new_vma,
 
 	if ((old_addr & ~HPAGE_PMD_MASK) ||
 	    (new_addr & ~HPAGE_PMD_MASK) ||
-	    (old_addr + HPAGE_PMD_SIZE) > old_end ||
+	    old_end - old_addr < HPAGE_PMD_SIZE ||
 	    (new_vma->vm_flags & VM_NOHUGEPAGE))
 		goto out;