Commit 65b3c07b authored Oct 08, 2012 by Xiao Guangrong Committed by Linus Torvalds Oct 09, 2012

thp: fix the count of THP_COLLAPSE_ALLOC



THP_COLLAPSE_ALLOC is double counted if NUMA is disabled since it has
already been calculated in khugepaged_alloc_hugepage

Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent db971418

mm/huge_memory.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1874,9 +1874,9 @@ static void collapse_huge_page(struct mm_struct *mm,
		*hpage = ERR_PTR(-ENOMEM);
		return;
		}
		count_vm_event(THP_COLLAPSE_ALLOC);
		#endif

		count_vm_event(THP_COLLAPSE_ALLOC);
		if (unlikely(mem_cgroup_newpage_charge(new_page, mm, GFP_KERNEL))) {
		#ifdef CONFIG_NUMA
		put_page(new_page);