From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 5 Oct 2011 00:43:01 +0000 (+1100)
Subject: thp-mremap-support-and-tlb-optimization-fix-fix
X-Git-Tag: next-20111007~1^2~177
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=20a286bb0d9853793eb127d6c7d77405f26b4cd5;p=karo-tx-linux.git

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

Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Johannes Weiner <jweiner@redhat.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index b975dc1db24f..fffab174f3e7 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1072,7 +1072,7 @@ int move_huge_pmd(struct vm_area_struct *vma, struct vm_area_struct *new_vma,
 	 * The destination pmd shouldn't be established, free_pgtables()
 	 * should have release it.
 	 */
-	if (!WARN_ON(pmd_none(*new_pmd))) {
+	if (WARN_ON(!pmd_none(*new_pmd))) {
 		VM_BUG_ON(pmd_trans_huge(*new_pmd));
 		goto out;
 	}