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

Commit 0620e4eb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cgroup: Fix issues in allow_attach callback"

parents cc699d74 89516a9c

include/linux/cgroup.h

+1 −1
Original line number Diff line number Diff line
@@ -948,7 +948,7 @@ static inline int cgroup_attach_task_all(struct task_struct *from, 
static inline int subsys_cgroup_allow_attach(struct cgroup_subsys_state *css,

					     void *tset)

{

	return 0;

	return -EINVAL;

}

#endif /* !CONFIG_CGROUPS */

kernel/sched/core.c

+1 −0
Original line number Diff line number Diff line
@@ -10092,6 +10092,7 @@ struct cgroup_subsys cpu_cgrp_subsys = { 
	.fork		= cpu_cgroup_fork,

	.can_attach	= cpu_cgroup_can_attach,

	.attach		= cpu_cgroup_attach,

	.allow_attach   = subsys_cgroup_allow_attach,

	.exit		= cpu_cgroup_exit,

	.legacy_cftypes	= cpu_files,

	.early_init	= 1,