diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-14 09:22:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-14 09:22:51 -0800 |
| commit | 3f1f9a9b715cfa5d9933a024807e32b206775f83 (patch) | |
| tree | 9c855992bc8190c2bfe039ffc36b19bc9c3c60eb /include/trace | |
| parent | Merge tag 'Intel-CVE-2019-14615' from bundle by Akeem Abodunrin. (diff) | |
| parent | mm: khugepaged: add trace status description for SCAN_PAGE_HAS_PRIVATE (diff) | |
| download | linux-dev-3f1f9a9b715cfa5d9933a024807e32b206775f83.tar.xz linux-dev-3f1f9a9b715cfa5d9933a024807e32b206775f83.zip | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"11 mm fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm: khugepaged: add trace status description for SCAN_PAGE_HAS_PRIVATE
mm: memcg/slab: call flush_memcg_workqueue() only if memcg workqueue is valid
mm/page-writeback.c: improve arithmetic divisions
mm/page-writeback.c: use div64_ul() for u64-by-unsigned-long divide
mm/page-writeback.c: avoid potential division by zero in wb_min_max_ratio()
mm, debug_pagealloc: don't rely on static keys too early
mm: memcg/slab: fix percpu slab vmstats flushing
mm/shmem.c: thp, shmem: fix conflict of above-47bit hint address and PMD alignment
mm/huge_memory.c: thp: fix conflict of above-47bit hint address and PMD alignment
mm/memory_hotplug: don't free usage map when removing a re-added early section
mm, thp: tweak reclaim/compaction effort of local-only and all-node allocations
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/huge_memory.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/trace/events/huge_memory.h b/include/trace/events/huge_memory.h index dd4db334bd63..d82a0f4e824d 100644 --- a/include/trace/events/huge_memory.h +++ b/include/trace/events/huge_memory.h @@ -31,7 +31,8 @@ EM( SCAN_ALLOC_HUGE_PAGE_FAIL, "alloc_huge_page_failed") \ EM( SCAN_CGROUP_CHARGE_FAIL, "ccgroup_charge_failed") \ EM( SCAN_EXCEED_SWAP_PTE, "exceed_swap_pte") \ - EMe(SCAN_TRUNCATED, "truncated") \ + EM( SCAN_TRUNCATED, "truncated") \ + EMe(SCAN_PAGE_HAS_PRIVATE, "page_has_private") \ #undef EM #undef EMe |