Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 65b3c07b43f7f8a5cbf8923011bd4e6650e3d1dc

Authored by Xiao Guangrong
Committed by Linus Torvalds
1 parent db97141882
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -1874,9 +1874,9 @@
1874 1874 *hpage = ERR_PTR(-ENOMEM);
1875 1875 return;
1876 1876 }
  1877 + count_vm_event(THP_COLLAPSE_ALLOC);
1877 1878 #endif
1878 1879  
1879   - count_vm_event(THP_COLLAPSE_ALLOC);
1880 1880 if (unlikely(mem_cgroup_newpage_charge(new_page, mm, GFP_KERNEL))) {
1881 1881 #ifdef CONFIG_NUMA
1882 1882 put_page(new_page);