diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2024-11-11 00:04:10 -0800 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2024-11-11 00:04:10 -0800 |
| commit | 2ec0859039ecddc95f5d94c134d01aa639a49622 (patch) | |
| tree | 430d0a7a1f38b8d50a9bf455c1835426fda6a571 /mm/memcontrol.c | |
| parent | 73da523802eafafe7e55a5e8a8bc8ee3f5cf3b9b (diff) | |
| parent | e7ac4daeed91a25382091e73818ea0cddb1afd5e (diff) | |
Merge branch 'mm-hotfixes-stable' into mm-stable
Pick up e7ac4daeed91 ("mm: count zeromap read and set for swapout and
swapin") in order to move
mm: define obj_cgroup_get() if CONFIG_MEMCG is not defined
mm: zswap: modify zswap_compress() to accept a page instead of a folio
mm: zswap: rename zswap_pool_get() to zswap_pool_tryget()
mm: zswap: modify zswap_stored_pages to be atomic_long_t
mm: zswap: support large folios in zswap_store()
mm: swap: count successful large folio zswap stores in hugepage zswpout stats
mm: zswap: zswap_store_page() will initialize entry after adding to xarray.
mm: add per-order mTHP swpin counters
from mm-unstable into mm-stable.
Diffstat (limited to 'mm/memcontrol.c')
| -rw-r--r-- | mm/memcontrol.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index bc0033a2aa3c..3402b6d13bc2 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -438,6 +438,10 @@ static const unsigned int memcg_vm_event_stat[] = { PGDEACTIVATE, PGLAZYFREE, PGLAZYFREED, +#ifdef CONFIG_SWAP + SWPIN_ZERO, + SWPOUT_ZERO, +#endif #ifdef CONFIG_ZSWAP ZSWPIN, ZSWPOUT, |