From f627d47d362450d02631b31af09bfc68c328fcc6 Mon Sep 17 00:00:00 2001 From: Liujie Xie Date: Fri, 25 Jun 2021 22:16:33 +0800 Subject: [PATCH] ANDROID: Export memcg functions to allow module to add new files Export cgroup_add_legacy_cftypes and a helper function to allow vendor module to expose additional files in the memory cgroup hierarchy. Bug: 192052083 Signed-off-by: Liujie Xie (cherry picked from commit f41a95eadca98506e627b21f5cc73332bba4d95c) (cherry picked from commit bf24c43b7f90290d2ac6f8163b43ab00f8f820b9) Change-Id: Ie2b936b3e77c7ab6d740d1bb6d70e03c70a326a7 Signed-off-by: lvwenhuan --- kernel/cgroup/cgroup.c | 1 + mm/memcontrol.c | 1 + 2 files changed, 2 insertions(+) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 9672a065fc9a..e4045593ea2b 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -4460,6 +4460,7 @@ int cgroup_add_legacy_cftypes(struct cgroup_subsys *ss, struct cftype *cfts) cft->flags |= __CFTYPE_NOT_ON_DFL; return cgroup_add_cftypes(ss, cfts); } +EXPORT_SYMBOL_GPL(cgroup_add_legacy_cftypes); /** * cgroup_file_notify - generate a file modified event for a cgroup_file diff --git a/mm/memcontrol.c b/mm/memcontrol.c index c580f8ea5076..aa09cf4e8bb5 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5187,6 +5187,7 @@ struct mem_cgroup *mem_cgroup_from_id(unsigned short id) WARN_ON_ONCE(!rcu_read_lock_held()); return idr_find(&mem_cgroup_idr, id); } +EXPORT_SYMBOL_GPL(mem_cgroup_from_id); #ifdef CONFIG_SHRINKER_DEBUG struct mem_cgroup *mem_cgroup_get_from_ino(unsigned long ino)