diff options
| author | Oleg Nesterov <oleg@redhat.com> | 2014-06-04 16:07:34 -0700 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2019-05-02 17:29:24 +0200 |
| commit | 1eda569b4ae6566fe656085c818e0f6719d64017 (patch) | |
| tree | c0fb7d7d9490ba7e7ebd8fb4842d66eecb840871 /include/linux | |
| parent | c2d67afc6ba9cd413c1cf2d0dfd41850a5a14ebf (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.
Change-Id: I07980d9557cef16a102ed293bc4a8ad1f9302777
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 'include/linux')
| -rw-r--r-- | include/linux/mm_types.h | 2 | ||||
| -rw-r--r-- | include/linux/sched.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index e4aaca1c3..d55932761 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -394,7 +394,7 @@ struct mm_struct { spinlock_t ioctx_lock; struct hlist_head ioctx_list; #endif -#ifdef CONFIG_MM_OWNER +#ifdef CONFIG_MEMCG /* * "owner" points to a task that is regarded as the canonical * user/owner of this mm. All of the following must be true in diff --git a/include/linux/sched.h b/include/linux/sched.h index aa76cc2ae..e45c95c02 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -2894,7 +2894,7 @@ static inline void inc_syscfs(struct task_struct *tsk) #define TASK_SIZE_OF(tsk) TASK_SIZE #endif -#ifdef CONFIG_MM_OWNER +#ifdef CONFIG_MEMCG extern void mm_update_next_owner(struct mm_struct *mm); extern void mm_init_owner(struct mm_struct *mm, struct task_struct *p); #else @@ -2905,7 +2905,7 @@ static inline void mm_update_next_owner(struct mm_struct *mm) static inline void mm_init_owner(struct mm_struct *mm, struct task_struct *p) { } -#endif /* CONFIG_MM_OWNER */ +#endif /* CONFIG_MEMCG */ static inline unsigned long task_rlimit(const struct task_struct *tsk, unsigned int limit) |