Skip to content

Commit

Permalink
cgroups: fix declaration of cgroup_mm_owner_callbacks
Browse files Browse the repository at this point in the history
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>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Paul Menage authored and Linus Torvalds committed Oct 20, 2008
1 parent cc31edc commit 886465f
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions include/linux/cgroup.h
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,9 @@ void cgroup_iter_end(struct cgroup *cgrp, struct cgroup_iter *it);
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; }
Expand All @@ -421,15 +424,9 @@ static inline int cgroupstats_build(struct cgroupstats *stats,
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 */

0 comments on commit 886465f

Please sign in to comment.