[folded-merged] mm-consolidate-page-table-accounting-fix-fix.patch removed from -mm tree

[folded-merged] mm-consolidate-page-table-accounting-fix-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: mm-consolidate-page-table-accounting-fix-fix
has been removed from the -mm tree.  Its filename was
     mm-consolidate-page-table-accounting-fix-fix.patch

This patch was dropped because it was folded into mm-consolidate-page-table-accounting.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm-consolidate-page-table-accounting-fix-fix

fix mm/huge_memory.c

Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/huge_memory.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN mm/huge_memory.c~mm-consolidate-page-table-accounting-fix-fix mm/huge_memory.c
--- a/mm/huge_memory.c~mm-consolidate-page-table-accounting-fix-fix
+++ a/mm/huge_memory.c
@@ -942,7 +942,7 @@ int copy_huge_pmd(struct mm_struct *dst_
 			set_pmd_at(src_mm, addr, src_pmd, pmd);
 		}
 		add_mm_counter(dst_mm, MM_ANONPAGES, HPAGE_PMD_NR);
-		atomic_long_inc(&dst_mm->nr_ptes);
+		mm_inc_nr_ptes(dst_mm);
 		pgtable_trans_huge_deposit(dst_mm, dst_pmd, pgtable);
 		set_pmd_at(dst_mm, addr, dst_pmd, pmd);
 		ret = 0;
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

include-linux-sched-mmh-uninline-mmdrop_async-etc.patch
mm-consolidate-page-table-accounting.patch
mm-stop-zeroing-memory-during-allocation-in-vmemmap-fix.patch
mm-batch-radix-tree-operations-when-truncating-pages-fix-fix.patch
mm-simplify-nodemask-printing-fix.patch
mm-make-alloc_node_mem_map-a-voidcall-if-we-dont-have-config_flat_node_mem_map-fix.patch