diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/sched.c | 2 | ||||
-rw-r--r-- | kernel/sched_fair.c | 3 | ||||
-rw-r--r-- | kernel/sched_idletask.c | 2 | ||||
-rw-r--r-- | kernel/sched_rt.c | 3 |
4 files changed, 4 insertions, 6 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 43ae1566b8f..e51d75f4b4d 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -859,7 +859,7 @@ enqueue_task(struct rq *rq, struct task_struct *p, int wakeup, u64 now) | |||
859 | static void | 859 | static void |
860 | dequeue_task(struct rq *rq, struct task_struct *p, int sleep, u64 now) | 860 | dequeue_task(struct rq *rq, struct task_struct *p, int sleep, u64 now) |
861 | { | 861 | { |
862 | p->sched_class->dequeue_task(rq, p, sleep, now); | 862 | p->sched_class->dequeue_task(rq, p, sleep); |
863 | p->se.on_rq = 0; | 863 | p->se.on_rq = 0; |
864 | } | 864 | } |
865 | 865 | ||
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index 81db9626b7e..fb4d614af2c 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c | |||
@@ -800,8 +800,7 @@ static void enqueue_task_fair(struct rq *rq, struct task_struct *p, int wakeup) | |||
800 | * decreased. We remove the task from the rbtree and | 800 | * decreased. We remove the task from the rbtree and |
801 | * update the fair scheduling stats: | 801 | * update the fair scheduling stats: |
802 | */ | 802 | */ |
803 | static void | 803 | static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int sleep) |
804 | dequeue_task_fair(struct rq *rq, struct task_struct *p, int sleep, u64 now) | ||
805 | { | 804 | { |
806 | struct cfs_rq *cfs_rq; | 805 | struct cfs_rq *cfs_rq; |
807 | struct sched_entity *se = &p->se; | 806 | struct sched_entity *se = &p->se; |
diff --git a/kernel/sched_idletask.c b/kernel/sched_idletask.c index dc9e1068911..f69e083e0d9 100644 --- a/kernel/sched_idletask.c +++ b/kernel/sched_idletask.c | |||
@@ -25,7 +25,7 @@ static struct task_struct *pick_next_task_idle(struct rq *rq, u64 now) | |||
25 | * message if some code attempts to do it: | 25 | * message if some code attempts to do it: |
26 | */ | 26 | */ |
27 | static void | 27 | static void |
28 | dequeue_task_idle(struct rq *rq, struct task_struct *p, int sleep, u64 now) | 28 | dequeue_task_idle(struct rq *rq, struct task_struct *p, int sleep) |
29 | { | 29 | { |
30 | spin_unlock_irq(&rq->lock); | 30 | spin_unlock_irq(&rq->lock); |
31 | printk(KERN_ERR "bad: scheduling from the idle thread!\n"); | 31 | printk(KERN_ERR "bad: scheduling from the idle thread!\n"); |
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index 1edaa99e0d3..60591e2512b 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c | |||
@@ -36,8 +36,7 @@ static void enqueue_task_rt(struct rq *rq, struct task_struct *p, int wakeup) | |||
36 | /* | 36 | /* |
37 | * Adding/removing a task to/from a priority array: | 37 | * Adding/removing a task to/from a priority array: |
38 | */ | 38 | */ |
39 | static void | 39 | static void dequeue_task_rt(struct rq *rq, struct task_struct *p, int sleep) |
40 | dequeue_task_rt(struct rq *rq, struct task_struct *p, int sleep, u64 now) | ||
41 | { | 40 | { |
42 | struct rt_prio_array *array = &rq->rt.active; | 41 | struct rt_prio_array *array = &rq->rt.active; |
43 | 42 | ||