Messages in this thread Patch in this message | | | Subject | [PATCH] Fix declaration of cgroup_mm_owner_callbacks | Date | Mon, 15 Sep 2008 12:06:38 -0700 (PDT) | From | (Paul Menage) |
| |
Fix declaration of cgroup_mm_owner_callbacks()
The choice of real/dummy declaration for cgroup_mm_owner_callbacks() shouldn't be based on CONFIG_MM_OWNER, but on CONFIG_CGROUPS. Otherwise kernel/exit.c fails to compile when something other than a cgroups controller selects CONFIG_MM_OWNER
Signed-off-by: Paul Menage <menage@google.com>
---
This is a retry with a mailer that hopefully didn't break the whitespace formatting
include/linux/cgroup.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
Index: mmowner-mmotm-2008-09-10/include/linux/cgroup.h =================================================================== --- mmowner-mmotm-2008-09-10.orig/include/linux/cgroup.h +++ mmowner-mmotm-2008-09-10/include/linux/cgroup.h @@ -403,6 +403,9 @@ void cgroup_iter_end(struct cgroup *cgrp int cgroup_scan_tasks(struct cgroup_scanner *scan); int cgroup_attach_task(struct cgroup *, struct task_struct *); +void cgroup_mm_owner_callbacks(struct task_struct *old, + struct task_struct *new); + #else /* !CONFIG_CGROUPS */ static inline int cgroup_init_early(void) { return 0; } @@ -421,15 +424,9 @@ static inline int cgroupstats_build(stru return -EINVAL; } +static inline void cgroup_mm_owner_callbacks(struct task_struct *old, + struct task_struct *new) {} + #endif /* !CONFIG_CGROUPS */ -#ifdef CONFIG_MM_OWNER -extern void -cgroup_mm_owner_callbacks(struct task_struct *old, struct task_struct *new); -#else /* !CONFIG_MM_OWNER */ -static inline void -cgroup_mm_owner_callbacks(struct task_struct *old, struct task_struct *new) -{ -} -#endif /* CONFIG_MM_OWNER */ #endif /* _LINUX_CGROUP_H */
| |