mm: remove the leftovers of noswapaccount

In commit a2c8990aed5ab ("memsw: remove noswapaccount kernel parameter"),
Michal forgot to remove some left pieces of noswapaccount in the tree,
this patch removes them all.

Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index d59e71df5c5ce72e9128a02bde5dc5c916585586..f9d240dfac0695dd547de81d696365ee4207fee7 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -518,22 +518,6 @@ Files:     net/netfilter/xt_connlimit.c
 
 ----------------------------
 
-What:  noswapaccount kernel command line parameter
-When:  2.6.40
-Why:   The original implementation of memsw feature enabled by
-       CONFIG_CGROUP_MEM_RES_CTLR_SWAP could be disabled by the noswapaccount
-       kernel parameter (introduced in 2.6.29-rc1). Later on, this decision
-       turned out to be not ideal because we cannot have the feature compiled
-       in and disabled by default and let only interested to enable it
-       (e.g. general distribution kernels might need it). Therefore we have
-       added swapaccount[=0|1] parameter (introduced in 2.6.37) which provides
-       the both possibilities. If we remove noswapaccount we will have
-       less command line parameters with the same functionality and we
-       can also cleanup the parameter handling a bit ().
-Who:   Michal Hocko <mhocko@suse.cz>
-
-----------------------------
-
 What:  ipt_addrtype match include file
 When:  2012
 Why:   superseded by xt_addrtype

diff --git a/init/Kconfig b/init/Kconfig
index e20aa3112240b8c76f02f0e1048f737464f8166d..d62778390e5556af22a95cc61d6b5e0cdeeb262e 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -673,7 +673,7 @@ config CGROUP_MEM_RES_CTLR_SWAP
          be careful about enabling this. When memory resource controller
          is disabled by boot option, this will be automatically disabled and
          there will be no overhead from this. Even when you set this config=y,
-         if boot option "noswapaccount" is set, swap will not be accounted.
+         if boot option "swapaccount=0" is set, swap will not be accounted.
          Now, memory usage of swap_cgroup is 2 bytes per entry. If swap page
          size is 4096bytes, 512k per 1Gbytes of swap.
 config CGROUP_MEM_RES_CTLR_SWAP_ENABLED
@@ -688,7 +688,7 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED
          parameter should have this option unselected.
          For those who want to have the feature enabled by default should
          select this option (if, for some reason, they need to disable it
-         then noswapaccount does the trick).
+         then swapaccount=0 does the trick).
 
 config CGROUP_PERF
        bool "Enable perf_event per-cpu per-container group (cgroup) monitoring"

diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c
index 53bffc6c293eb4fb7aa2a00be5a8712946dab5c9..9cb1c44ffc37229619cf6e6b27df483283c02c7c 100644 (file)
--- a/mm/page_cgroup.c
+++ b/mm/page_cgroup.c
@@ -537,7 +537,7 @@ int swap_cgroup_swapon(int type, unsigned long max_pages)
 nomem:
        printk(KERN_INFO "couldn't allocate enough memory for swap_cgroup.\n");
        printk(KERN_INFO
-               "swap_cgroup can be disabled by noswapaccount boot option\n");
+               "swap_cgroup can be disabled by swapaccount=0 boot option\n");
        return -ENOMEM;
 }