Commit e55b9f96 authored by Johannes Weiner's avatar Johannes Weiner Committed by Andrew Morton
Browse files

mm: memcontrol: drop dead CONFIG_MEMCG_SWAP config symbol 

Since 2d1c4980 ("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: default avatarJohannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarShakeel 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: default avatarAndrew Morton <akpm@linux-foundation.org>
parent b94c4e94

Documentation/admin-guide/cgroup-v1/memory.rst

+1 −3
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ Per-node-per-memcgroup LRU (cgroup's private LRU) is guarded by 
lruvec->lru_lock; PG_lru bit of page->flags is cleared before

isolating a page from its LRU under lruvec->lru_lock.



2.7 Kernel Memory Extension (CONFIG_MEMCG_KMEM)

2.7 Kernel Memory Extension

-----------------------------------------------



With the Kernel memory extension, the Memory Controller is able to limit
@@ -386,8 +386,6 @@ U != 0, K >= U: 


a. Enable CONFIG_CGROUPS

b. Enable CONFIG_MEMCG

c. Enable CONFIG_MEMCG_SWAP (to use swap extension)

d. Enable CONFIG_MEMCG_KMEM (to use kmem extension)



3.1. Prepare the cgroups (see cgroups.txt, Why are cgroups needed?)

-------------------------------------------------------------------

arch/mips/configs/db1xxx_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ CONFIG_HIGH_RES_TIMERS=y 
CONFIG_LOG_BUF_SHIFT=16

CONFIG_CGROUPS=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_BLK_CGROUP=y

CONFIG_CGROUP_SCHED=y

CONFIG_CFS_BANDWIDTH=y

arch/mips/configs/generic_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ CONFIG_NO_HZ_IDLE=y 
CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_BLK_CGROUP=y

CONFIG_CFS_BANDWIDTH=y

CONFIG_RT_GROUP_SCHED=y

arch/powerpc/configs/powernv_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=13 
CONFIG_NUMA_BALANCING=y

CONFIG_CGROUPS=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_CGROUP_SCHED=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CPUSETS=y

arch/powerpc/configs/pseries_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=13 
CONFIG_NUMA_BALANCING=y

CONFIG_CGROUPS=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_CGROUP_SCHED=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CPUSETS=y