memcg-make-pgpgin-and-pgpgout-v1-only.patch removed from -mm tree
The quilt patch titled
Subject: memcg: make PGPGIN and PGPGOUT v1 only
has been removed from the -mm tree. Its filename was
memcg-make-pgpgin-and-pgpgout-v1-only.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Shakeel Butt <[email protected]>
Subject: memcg: make PGPGIN and PGPGOUT v1 only
Date: Wed, 14 Aug 2024 22:04:53 -0700
Currently PGPGIN and PGPGOUT are used and exposed in the memcg v1 only code. So, let's put them under CONFIG_MEMCG_V1.
Signed-off-by Shakeel Butt <[email protected]>
Cc Johannes Weiner <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Muchun Song <[email protected]>
Cc Roman Gushchin <[email protected]>
Cc T.J. Mercier <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/memcontrol.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
mm/memcontrol.c renamed from mm/memcontrol.c~memcg-make-pgpgin-and-pgpgout-v1-only +4 -1
@@ -408,8 +408,10 @@ unsigned long lruvec_page_state_local(st/* Subset of vm_event_item to report for memcg event stats */ static const unsigned int memcg_vm_event_stat[] = { +#ifdef CONFIG_MEMCG_V1PGPGIN ,PGPGOUT , +#endifPGSCAN_KSWAPD ,PGSCAN_DIRECT ,PGSCAN_KHUGEPAGED ,
@@ -1429,10 +1431,11 @@ static void memcg_stat_format(struct mem memcg_events(memcg, PGSTEAL_KHUGEPAGED));for (i =0 ; i <ARRAY_SIZE (memcg_vm_event_stat); i++) { +#ifdef CONFIG_MEMCG_V1 if (memcg_vm_event_stat[i] ==PGPGIN || memcg_vm_event_stat[i] ==PGPGOUT )continue ; - +#endif seq_buf_printf (s,"%s %lu\n" ,vm_event_name (memcg_vm_event_stat[i]),memcg_events (memcg, memcg_vm_event_stat[i]));
_
Patches currently in -mm which might be from [email protected] are