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 /kernel/exit.c | |
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 'kernel/exit.c')
-rw-r--r-- | kernel/exit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 6ed6a1d552b5..da1b838de8a6 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -352,7 +352,7 @@ int disallow_signal(int sig) | |||
352 | 352 | ||
353 | EXPORT_SYMBOL(disallow_signal); | 353 | EXPORT_SYMBOL(disallow_signal); |
354 | 354 | ||
355 | #ifdef CONFIG_MM_OWNER | 355 | #ifdef CONFIG_MEMCG |
356 | /* | 356 | /* |
357 | * A task is exiting. If it owned this mm, find a new owner for the mm. | 357 | * A task is exiting. If it owned this mm, find a new owner for the mm. |
358 | */ | 358 | */ |
@@ -434,7 +434,7 @@ assign_new_owner: | |||
434 | task_unlock(c); | 434 | task_unlock(c); |
435 | put_task_struct(c); | 435 | put_task_struct(c); |
436 | } | 436 | } |
437 | #endif /* CONFIG_MM_OWNER */ | 437 | #endif /* CONFIG_MEMCG */ |
438 | 438 | ||
439 | /* | 439 | /* |
440 | * Turn us into a lazy TLB process if we | 440 | * Turn us into a lazy TLB process if we |