summaryrefslogtreecommitdiffstats
path: root/kernel/sched/sched.h
diff options
context:
space:
mode:
authorIngo Molnar2016-02-29 09:42:07 +0100
committerIngo Molnar2016-02-29 09:42:07 +0100
commit6aa447bcbb444cd1b738613a20627f288d631665 (patch)
tree62030bb14be0006248181305ac1fe377a99e5b65 /kernel/sched/sched.h
parentrcu: Use simple wait queues where possible in rcutree (diff)
parentsched/deadline: Always calculate end of period on sched_yield() (diff)
downloadkernel-qcow2-linux-6aa447bcbb444cd1b738613a20627f288d631665.tar.gz
kernel-qcow2-linux-6aa447bcbb444cd1b738613a20627f288d631665.tar.xz
kernel-qcow2-linux-6aa447bcbb444cd1b738613a20627f288d631665.zip
Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/sched.h')
-rw-r--r--kernel/sched/sched.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 1d583870e1a6..91f0a7752058 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -313,7 +313,7 @@ extern int tg_nop(struct task_group *tg, void *data);
extern void free_fair_sched_group(struct task_group *tg);
extern int alloc_fair_sched_group(struct task_group *tg, struct task_group *parent);
-extern void unregister_fair_sched_group(struct task_group *tg, int cpu);
+extern void unregister_fair_sched_group(struct task_group *tg);
extern void init_tg_cfs_entry(struct task_group *tg, struct cfs_rq *cfs_rq,
struct sched_entity *se, int cpu,
struct sched_entity *parent);