summaryrefslogtreecommitdiff
path: root/include/linux/swap_cgroup.h
diff options
context:
space:
mode:
authorJohannes Weiner <hannes@cmpxchg.org>2022-09-26 16:57:04 +0300
committerAndrew Morton <akpm@linux-foundation.org>2022-10-04 00:03:36 +0300
commite55b9f96860f6c6026cff97966a740576285e07b (patch)
treea0341415c2b45733d612961e2e356dad07954300 /include/linux/swap_cgroup.h
parentb94c4e949c36e0e363515822ade0d8305e9a6ef2 (diff)
downloadlinux-e55b9f96860f6c6026cff97966a740576285e07b.tar.xz
mm: memcontrol: drop dead CONFIG_MEMCG_SWAP config symbol
Since 2d1c498072de ("mm: memcontrol: make swap tracking an integral part of memory control"), CONFIG_MEMCG_SWAP hasn't been a user-visible config option anymore, it just means CONFIG_MEMCG && CONFIG_SWAP. Update the sites accordingly and drop the symbol. [ While touching the docs, remove two references to CONFIG_MEMCG_KMEM, which hasn't been a user-visible symbol for over half a decade. ] Link: https://lkml.kernel.org/r/20220926135704.400818-5-hannes@cmpxchg.org Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Shakeel Butt <shakeelb@google.com> Cc: Hugh Dickins <hughd@google.com> Cc: Michal Hocko <mhocko@suse.com> Cc: Roman Gushchin <roman.gushchin@linux.dev> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'include/linux/swap_cgroup.h')
-rw-r--r--include/linux/swap_cgroup.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/swap_cgroup.h b/include/linux/swap_cgroup.h
index a12dd1c3966c..ae73a87775b3 100644
--- a/include/linux/swap_cgroup.h
+++ b/include/linux/swap_cgroup.h
@@ -4,7 +4,7 @@
#include <linux/swap.h>
-#ifdef CONFIG_MEMCG_SWAP
+#if defined(CONFIG_MEMCG) && defined(CONFIG_SWAP)
extern unsigned short swap_cgroup_cmpxchg(swp_entry_t ent,
unsigned short old, unsigned short new);
@@ -40,6 +40,6 @@ static inline void swap_cgroup_swapoff(int type)
return;
}
-#endif /* CONFIG_MEMCG_SWAP */
+#endif
#endif /* __LINUX_SWAP_CGROUP_H */