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 b975dc1db24f814c6749644e22b3d8a139df5f34..fffab174f3e76bb7def297ef5649882aedbcf958 100644 (file)
--- 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;
        }