The patch titled
Subject: mm/memcontrol.c: make cgroup_memory_noswap static
has been added to the -mm tree. Its filename is
mm-memcontrolc-make-cgroup_memory_noswap-static.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/mm-memcontrolc-make-cgroup_memory_noswap-static.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/mm-memcontrolc-make-cgroup_memory_noswap-static.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Lu Jialin <lujialin4@xxxxxxxxxx>
Subject: mm/memcontrol.c: make cgroup_memory_noswap static
cgroup_memory_noswap is only used in mm/memcontrol.c, therefore just make
it static, and remove export in include/linux/memcontrol.h
Link: https://lkml.kernel.org/r/20220421124736.62180-1-lujialin4@xxxxxxxxxx
Signed-off-by: Lu Jialin <lujialin4@xxxxxxxxxx>
Acked-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Acked-by: Shakeel Butt <shakeelb@xxxxxxxxxx>
Acked-by: Roman Gushchin <roman.gushchin@xxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/memcontrol.h | 4 ----
mm/memcontrol.c | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
--- a/include/linux/memcontrol.h~mm-memcontrolc-make-cgroup_memory_noswap-static
+++ a/include/linux/memcontrol.h
@@ -937,10 +937,6 @@ struct mem_cgroup *mem_cgroup_get_oom_gr
struct mem_cgroup *oom_domain);
void mem_cgroup_print_oom_group(struct mem_cgroup *memcg);
-#ifdef CONFIG_MEMCG_SWAP
-extern bool cgroup_memory_noswap;
-#endif
-
void folio_memcg_lock(struct folio *folio);
void folio_memcg_unlock(struct folio *folio);
void lock_page_memcg(struct page *page);
--- a/mm/memcontrol.c~mm-memcontrolc-make-cgroup_memory_noswap-static
+++ a/mm/memcontrol.c
@@ -90,7 +90,7 @@ static bool cgroup_memory_nokmem __ro_af
/* Whether the swap controller is active */
#ifdef CONFIG_MEMCG_SWAP
-bool cgroup_memory_noswap __ro_after_init;
+static bool cgroup_memory_noswap __ro_after_init;
#else
#define cgroup_memory_noswap 1
#endif
_
Patches currently in -mm which might be from lujialin4@xxxxxxxxxx are
mm-memcontrolc-make-cgroup_memory_noswap-static.patch
