diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2012-07-31 19:43:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-31 21:42:43 -0400 |
commit | c255a458055e459f65eb7b7f51dc5dbdd0caf1d8 (patch) | |
tree | b143b1914eeb6f27f53e30f9f0275d0f1ca5480b /init/Kconfig | |
parent | 80934513b230bfcf70265f2ef0fdae89fb391633 (diff) |
memcg: rename config variables
Sanity:
CONFIG_CGROUP_MEM_RES_CTLR -> CONFIG_MEMCG
CONFIG_CGROUP_MEM_RES_CTLR_SWAP -> CONFIG_MEMCG_SWAP
CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED -> CONFIG_MEMCG_SWAP_ENABLED
CONFIG_CGROUP_MEM_RES_CTLR_KMEM -> CONFIG_MEMCG_KMEM
[mhocko@suse.cz: fix missed bits]
Cc: Glauber Costa <glommer@parallels.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: David Rientjes <rientjes@google.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init/Kconfig')
-rw-r--r-- | init/Kconfig | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/init/Kconfig b/init/Kconfig index 72437760e90e..af6c7f8ba019 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -686,7 +686,7 @@ config RESOURCE_COUNTERS | |||
686 | This option enables controller independent resource accounting | 686 | This option enables controller independent resource accounting |
687 | infrastructure that works with cgroups. | 687 | infrastructure that works with cgroups. |
688 | 688 | ||
689 | config CGROUP_MEM_RES_CTLR | 689 | config MEMCG |
690 | bool "Memory Resource Controller for Control Groups" | 690 | bool "Memory Resource Controller for Control Groups" |
691 | depends on RESOURCE_COUNTERS | 691 | depends on RESOURCE_COUNTERS |
692 | select MM_OWNER | 692 | select MM_OWNER |
@@ -709,9 +709,9 @@ config CGROUP_MEM_RES_CTLR | |||
709 | This config option also selects MM_OWNER config option, which | 709 | This config option also selects MM_OWNER config option, which |
710 | could in turn add some fork/exit overhead. | 710 | could in turn add some fork/exit overhead. |
711 | 711 | ||
712 | config CGROUP_MEM_RES_CTLR_SWAP | 712 | config MEMCG_SWAP |
713 | bool "Memory Resource Controller Swap Extension" | 713 | bool "Memory Resource Controller Swap Extension" |
714 | depends on CGROUP_MEM_RES_CTLR && SWAP | 714 | depends on MEMCG && SWAP |
715 | help | 715 | help |
716 | Add swap management feature to memory resource controller. When you | 716 | Add swap management feature to memory resource controller. When you |
717 | enable this, you can limit mem+swap usage per cgroup. In other words, | 717 | enable this, you can limit mem+swap usage per cgroup. In other words, |
@@ -726,9 +726,9 @@ config CGROUP_MEM_RES_CTLR_SWAP | |||
726 | if boot option "swapaccount=0" is set, swap will not be accounted. | 726 | if boot option "swapaccount=0" is set, swap will not be accounted. |
727 | Now, memory usage of swap_cgroup is 2 bytes per entry. If swap page | 727 | Now, memory usage of swap_cgroup is 2 bytes per entry. If swap page |
728 | size is 4096bytes, 512k per 1Gbytes of swap. | 728 | size is 4096bytes, 512k per 1Gbytes of swap. |
729 | config CGROUP_MEM_RES_CTLR_SWAP_ENABLED | 729 | config MEMCG_SWAP_ENABLED |
730 | bool "Memory Resource Controller Swap Extension enabled by default" | 730 | bool "Memory Resource Controller Swap Extension enabled by default" |
731 | depends on CGROUP_MEM_RES_CTLR_SWAP | 731 | depends on MEMCG_SWAP |
732 | default y | 732 | default y |
733 | help | 733 | help |
734 | Memory Resource Controller Swap Extension comes with its price in | 734 | Memory Resource Controller Swap Extension comes with its price in |
@@ -739,9 +739,9 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED | |||
739 | For those who want to have the feature enabled by default should | 739 | For those who want to have the feature enabled by default should |
740 | select this option (if, for some reason, they need to disable it | 740 | select this option (if, for some reason, they need to disable it |
741 | then swapaccount=0 does the trick). | 741 | then swapaccount=0 does the trick). |
742 | config CGROUP_MEM_RES_CTLR_KMEM | 742 | config MEMCG_KMEM |
743 | bool "Memory Resource Controller Kernel Memory accounting (EXPERIMENTAL)" | 743 | bool "Memory Resource Controller Kernel Memory accounting (EXPERIMENTAL)" |
744 | depends on CGROUP_MEM_RES_CTLR && EXPERIMENTAL | 744 | depends on MEMCG && EXPERIMENTAL |
745 | default n | 745 | default n |
746 | help | 746 | help |
747 | The Kernel Memory extension for Memory Resource Controller can limit | 747 | The Kernel Memory extension for Memory Resource Controller can limit |