Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 886465f4 authored by Paul Menage's avatar Paul Menage Committed by Linus Torvalds
Browse files

cgroups: 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: default avatarPaul Menage <menage@google.com>
Acked-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cc31edce

include/linux/cgroup.h

+6 −9
Original line number Diff line number Diff line
@@ -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; }
@@ -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 */