Memory controller: rename to Memory Resource Controller

Rename Memory Controller to Memory Resource Controller.  Reflect the same
changes in the CONFIG definition for the Memory Resource Controller.  Group
together the config options for Resource Counters and Memory Resource
Controller.

Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Cc: Paul Menage <menage@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 15 insertions, 15 deletions

diff --git a/init/Kconfig b/init/Kconfig
index f698a5af5007..442850b984be 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -366,6 +366,21 @@ config RESOURCE_COUNTERS
           infrastructure that works with cgroups
         depends on CGROUPS
 
+config CGROUP_MEM_RES_CTLR
+        bool "Memory Resource Controller for Control Groups"
+        depends on CGROUPS && RESOURCE_COUNTERS
+        help
+          Provides a memory resource controller that manages both page cache and
+          RSS memory.
+
+          Note that setting this option increases fixed memory overhead
+          associated with each page of memory in the system by 4/8 bytes
+          and also increases cache misses because struct page on many 64bit
+          systems will not fit into a single cache line anymore.
+
+          Only enable when you're ok with these trade offs and really
+          sure you need the memory resource controller.
+
 config SYSFS_DEPRECATED
         bool "Create deprecated sysfs files"
         depends on SYSFS
@@ -387,21 +402,6 @@ config SYSFS_DEPRECATED
           If you are using a distro that was released in 2006 or later,
           it should be safe to say N here.
 
-config CGROUP_MEM_CONT
-        bool "Memory controller for cgroups"
-        depends on CGROUPS && RESOURCE_COUNTERS
-        help
-          Provides a memory controller that manages both page cache and
-          RSS memory.
-
-          Note that setting this option increases fixed memory overhead
-          associated with each page of memory in the system by 4/8 bytes
-          and also increases cache misses because struct page on many 64bit
-          systems will not fit into a single cache line anymore.
-
-          Only enable when you're ok with these trade offs and really
-          sure you need the memory controller.
-
 config PROC_PID_CPUSET
         bool "Include legacy /proc/<pid>/cpuset file"
         depends on CPUSETS