Skip to contentSkip to conversation

docs: cgroup-v1: replace dead CONFIG_MEM_RES_CTRL_SWAP symbol

PATCH Applied Krzysztof Pawlaczyk 3 participants 3 messages Jul 28, 2023 – Jul 31, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 docs: cgroup-v1: replace dead CONFIG_MEM_RES_CTRL_SWAP symbol

Commit e55b9f96860f ("mm: memcontrol: drop dead CONFIG_MEMCG_SWAP config symbol") removed MEMCG_SWAP as it was just a shorthand for CONFIG_MEMCG && CONFIG_SWAP.

The commit also adjusted the documentation but missed reference to CONFIG_MEM_RES_CTRL_SWAP, which was the previous name of CONFIG_MEMCG_SWAP before renaming in commit c255a458055e ("memcg: rename config variables").

Update the reference to the current state.

---
 Documentation/admin-guide/cgroup-v1/memcg_test.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/admin-guide/cgroup-v1/memcg_test.rst +1 -1
index a402359abb99..1f128458ddea 100644
@@ -62,7 +62,7 @@ Please note that implementation details can be changed.
 
 	At cancel(), simply usage -= PAGE_SIZE.
 
-Under below explanation, we assume CONFIG_MEM_RES_CTRL_SWAP=y.
+Under below explanation, we assume CONFIG_SWAP=y.
 
 4. Anonymous
 ============
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · On Fri, Jul 28, 2023 at 12:59 PM Krzysztof Pawlaczyk <[email protected]> wrote:

Commit e55b9f96860f ("mm: memcontrol: drop dead CONFIG_MEMCG_SWAP config symbol") removed MEMCG_SWAP as it was just a shorthand for CONFIG_MEMCG && CONFIG_SWAP.

Quoted 7 lines

The commit also adjusted the documentation but missed reference to CONFIG_MEM_RES_CTRL_SWAP, which was the previous name of CONFIG_MEMCG_SWAP before renaming in commit c255a458055e ("memcg: rename config variables").

Update the reference to the current state.

Thanks for the cleanup.

Lukas

Quoted 21 lines
---
 Documentation/admin-guide/cgroup-v1/memcg_test.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/admin-guide/cgroup-v1/memcg_test.rst +1 -2
index a402359abb99..1f128458ddea 100644
@@ -62,7 +62,7 @@ Please note that implementation details can be changed.
 
        At cancel(), simply usage -= PAGE_SIZE.
 
-Under below explanation, we assume CONFIG_MEM_RES_CTRL_SWAP=y.
+Under below explanation, we assume CONFIG_SWAP=y.
 
 4. Anonymous
 ============
--

2.25.1

maintainer Applied
#2 lore raw
In reply to Krzysztof Pawlaczyk
Quoted 21 lines · Krzysztof Pawlaczyk

Commit e55b9f96860f ("mm: memcontrol: drop dead CONFIG_MEMCG_SWAP config symbol") removed MEMCG_SWAP as it was just a shorthand for CONFIG_MEMCG && CONFIG_SWAP.

The commit also adjusted the documentation but missed reference to CONFIG_MEM_RES_CTRL_SWAP, which was the previous name of CONFIG_MEMCG_SWAP before renaming in commit c255a458055e ("memcg: rename config variables").

Update the reference to the current state.

---
 Documentation/admin-guide/cgroup-v1/memcg_test.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/admin-guide/cgroup-v1/memcg_test.rst +0 -0
index a402359abb99..1f128458ddea 100644

Documentation/admin-guide/cgroup-v1/memcg_test.rst Please note that implementation details can be changed. · line 66

Quoted 6 lines
Documentation/admin-guide/cgroup-v1/memcg_test.rst +1 -1
@@ -62,7 +62,7 @@ Please note that implementation details can be changed.
 
 	At cancel(), simply usage -= PAGE_SIZE.
 
-Under below explanation, we assume CONFIG_MEM_RES_CTRL_SWAP=y.
+Under below explanation, we assume CONFIG_SWAP=y.
 

Applied, thanks.

jon