On Mon, Aug 13, 2012 at 07:13:16PM +0800, Xiao Guangrong wrote: > 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 <xiaoguangr...@linux.vnet.ibm.com>
Acked-by: Kirill A. Shutemov <kirill.shute...@linux.intel.com> > --- > mm/huge_memory.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index 57c4b93..80bcd42 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -1880,9 +1880,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); > -- > 1.7.7.6 > > -- > To unsubscribe, send a message with 'unsubscribe linux-mm' in > the body to majord...@kvack.org. For more info on Linux MM, > see: http://www.linux-mm.org/ . > Don't email: <a href=mailto:"d...@kvack.org"> em...@kvack.org </a> -- Kirill A. Shutemov -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/