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.

Signed-off-by: Krzysztof Pawlaczyk <krzpaw@gmail.com>
---
 Documentation/admin-guide/cgroup-v1/memcg_test.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/admin-guide/cgroup-v1/memcg_test.rst b/Documentation/admin-guide/cgroup-v1/memcg_test.rst
index a402359abb99..1f128458ddea 100644
--- a/Documentation/admin-guide/cgroup-v1/memcg_test.rst
+++ b/Documentation/admin-guide/cgroup-v1/memcg_test.rst
@@ -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

Krzysztof Pawlaczyk <krzpaw@gmail.com> writes:

> 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.
>
> Signed-off-by: Krzysztof Pawlaczyk <krzpaw@gmail.com>
> ---
>  Documentation/admin-guide/cgroup-v1/memcg_test.rst | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/admin-guide/cgroup-v1/memcg_test.rst b/Documentation/admin-guide/cgroup-v1/memcg_test.rst
> index a402359abb99..1f128458ddea 100644
> --- a/Documentation/admin-guide/cgroup-v1/memcg_test.rst
> +++ b/Documentation/admin-guide/cgroup-v1/memcg_test.rst
> @@ -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

On Fri, Jul 28, 2023 at 12:59 PM Krzysztof Pawlaczyk <krzpaw@gmail.com> 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.
>
> 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.

Reviewed-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>

Lukas

> Signed-off-by: Krzysztof Pawlaczyk <krzpaw@gmail.com>
> ---
>  Documentation/admin-guide/cgroup-v1/memcg_test.rst | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/admin-guide/cgroup-v1/memcg_test.rst b/Documentation/admin-guide/cgroup-v1/memcg_test.rst
> index a402359abb99..1f128458ddea 100644
> --- a/Documentation/admin-guide/cgroup-v1/memcg_test.rst
> +++ b/Documentation/admin-guide/cgroup-v1/memcg_test.rst
> @@ -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
>