diff options
author | Oleg Nesterov <oleg@redhat.com> | 2014-06-04 19:07:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 19:54:01 -0400 |
commit | f98bafa06a28fdfdd5c49f820f4d6560f636fc46 (patch) | |
tree | 1fb3f5e67a2ac35ab19f17e3ae215aa81d6f5e1b /init | |
parent | 64ac4940d557df8caab602eaea679ec7eaf9a57f (diff) |
memcg: kill CONFIG_MM_OWNER
CONFIG_MM_OWNER makes no sense. It is not user-selectable, it is only
selected by CONFIG_MEMCG automatically. So we can kill this option in
init/Kconfig and do s/CONFIG_MM_OWNER/CONFIG_MEMCG/ globally.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
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 | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/init/Kconfig b/init/Kconfig index 4a1822a1a680..0a2f09a80e90 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -933,7 +933,6 @@ config RESOURCE_COUNTERS | |||
933 | config MEMCG | 933 | config MEMCG |
934 | bool "Memory Resource Controller for Control Groups" | 934 | bool "Memory Resource Controller for Control Groups" |
935 | depends on RESOURCE_COUNTERS | 935 | depends on RESOURCE_COUNTERS |
936 | select MM_OWNER | ||
937 | select EVENTFD | 936 | select EVENTFD |
938 | help | 937 | help |
939 | Provides a memory resource controller that manages both anonymous | 938 | Provides a memory resource controller that manages both anonymous |
@@ -951,9 +950,6 @@ config MEMCG | |||
951 | disable memory resource controller and you can avoid overheads. | 950 | disable memory resource controller and you can avoid overheads. |
952 | (and lose benefits of memory resource controller) | 951 | (and lose benefits of memory resource controller) |
953 | 952 | ||
954 | This config option also selects MM_OWNER config option, which | ||
955 | could in turn add some fork/exit overhead. | ||
956 | |||
957 | config MEMCG_SWAP | 953 | config MEMCG_SWAP |
958 | bool "Memory Resource Controller Swap Extension" | 954 | bool "Memory Resource Controller Swap Extension" |
959 | depends on MEMCG && SWAP | 955 | depends on MEMCG && SWAP |
@@ -1179,9 +1175,6 @@ config SCHED_AUTOGROUP | |||
1179 | desktop applications. Task group autogeneration is currently based | 1175 | desktop applications. Task group autogeneration is currently based |
1180 | upon task session. | 1176 | upon task session. |
1181 | 1177 | ||
1182 | config MM_OWNER | ||
1183 | bool | ||
1184 | |||
1185 | config SYSFS_DEPRECATED | 1178 | config SYSFS_DEPRECATED |
1186 | bool "Enable deprecated sysfs features to support old userspace tools" | 1179 | bool "Enable deprecated sysfs features to support old userspace tools" |
1187 | depends on SYSFS | 1180 | depends on SYSFS |