diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2011-07-25 20:12:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 23:57:09 -0400 |
| commit | 00a66d2974485d7d95d61d5772142b2a2231ed2a (patch) | |
| tree | 14d5ca10dfc641594e7109902cdabb4a3c408d98 /init | |
| parent | dd78553b5e7a0b34c0b60478d04ee16d8d8f4fa7 (diff) | |
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>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index e20aa3112240..d62778390e55 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -673,7 +673,7 @@ config CGROUP_MEM_RES_CTLR_SWAP | |||
| 673 | be careful about enabling this. When memory resource controller | 673 | be careful about enabling this. When memory resource controller |
| 674 | is disabled by boot option, this will be automatically disabled and | 674 | is disabled by boot option, this will be automatically disabled and |
| 675 | there will be no overhead from this. Even when you set this config=y, | 675 | there will be no overhead from this. Even when you set this config=y, |
| 676 | if boot option "noswapaccount" is set, swap will not be accounted. | 676 | if boot option "swapaccount=0" is set, swap will not be accounted. |
| 677 | Now, memory usage of swap_cgroup is 2 bytes per entry. If swap page | 677 | Now, memory usage of swap_cgroup is 2 bytes per entry. If swap page |
| 678 | size is 4096bytes, 512k per 1Gbytes of swap. | 678 | size is 4096bytes, 512k per 1Gbytes of swap. |
| 679 | config CGROUP_MEM_RES_CTLR_SWAP_ENABLED | 679 | config CGROUP_MEM_RES_CTLR_SWAP_ENABLED |
| @@ -688,7 +688,7 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED | |||
| 688 | parameter should have this option unselected. | 688 | parameter should have this option unselected. |
| 689 | For those who want to have the feature enabled by default should | 689 | For those who want to have the feature enabled by default should |
| 690 | select this option (if, for some reason, they need to disable it | 690 | select this option (if, for some reason, they need to disable it |
| 691 | then noswapaccount does the trick). | 691 | then swapaccount=0 does the trick). |
| 692 | 692 | ||
| 693 | config CGROUP_PERF | 693 | config CGROUP_PERF |
| 694 | bool "Enable perf_event per-cpu per-container group (cgroup) monitoring" | 694 | bool "Enable perf_event per-cpu per-container group (cgroup) monitoring" |
