aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/sched.h
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2014-06-04 19:07:34 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-04 19:54:01 -0400
commitf98bafa06a28fdfdd5c49f820f4d6560f636fc46 (patch)
tree1fb3f5e67a2ac35ab19f17e3ae215aa81d6f5e1b /include/linux/sched.h
parent64ac4940d557df8caab602eaea679ec7eaf9a57f (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 'include/linux/sched.h')
-rw-r--r--include/linux/sched.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 70f67e4e6156..2f2dd7d932a2 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2967,7 +2967,7 @@ static inline void inc_syscw(struct task_struct *tsk)
2967#define TASK_SIZE_OF(tsk) TASK_SIZE 2967#define TASK_SIZE_OF(tsk) TASK_SIZE
2968#endif 2968#endif
2969 2969
2970#ifdef CONFIG_MM_OWNER 2970#ifdef CONFIG_MEMCG
2971extern void mm_update_next_owner(struct mm_struct *mm); 2971extern void mm_update_next_owner(struct mm_struct *mm);
2972extern void mm_init_owner(struct mm_struct *mm, struct task_struct *p); 2972extern void mm_init_owner(struct mm_struct *mm, struct task_struct *p);
2973#else 2973#else
@@ -2978,7 +2978,7 @@ static inline void mm_update_next_owner(struct mm_struct *mm)
2978static inline void mm_init_owner(struct mm_struct *mm, struct task_struct *p) 2978static inline void mm_init_owner(struct mm_struct *mm, struct task_struct *p)
2979{ 2979{
2980} 2980}
2981#endif /* CONFIG_MM_OWNER */ 2981#endif /* CONFIG_MEMCG */
2982 2982
2983static inline unsigned long task_rlimit(const struct task_struct *tsk, 2983static inline unsigned long task_rlimit(const struct task_struct *tsk,
2984 unsigned int limit) 2984 unsigned int limit)