mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-22 01:10:28 +00:00
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>
This commit is contained in:
parent
db97141882
commit
65b3c07b43
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user