diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-25 08:15:31 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-25 08:15:31 -0500 |
| commit | 52e04ea89da57274f0313d2bd73ba02f686cfdeb (patch) | |
| tree | 6ce5d086bcaea4cb534b3fcf6ba736eb48d582a4 /kernel/sched_rt.c | |
| parent | 41116e926cb92292fa4fcbe888ae8133fa0038e6 (diff) | |
| parent | 8b90ca08821fee79e181bfcbc3bbd41ef5637136 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'kernel/sched_rt.c')
| -rw-r--r-- | kernel/sched_rt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index d2ea2828164e..f48328ac216f 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c | |||
| @@ -1472,7 +1472,7 @@ static void post_schedule_rt(struct rq *rq) | |||
| 1472 | * If we are not running and we are not going to reschedule soon, we should | 1472 | * If we are not running and we are not going to reschedule soon, we should |
| 1473 | * try to push tasks away now | 1473 | * try to push tasks away now |
| 1474 | */ | 1474 | */ |
| 1475 | static void task_wake_up_rt(struct rq *rq, struct task_struct *p) | 1475 | static void task_woken_rt(struct rq *rq, struct task_struct *p) |
| 1476 | { | 1476 | { |
| 1477 | if (!task_running(rq, p) && | 1477 | if (!task_running(rq, p) && |
| 1478 | !test_tsk_need_resched(rq->curr) && | 1478 | !test_tsk_need_resched(rq->curr) && |
| @@ -1753,7 +1753,7 @@ static const struct sched_class rt_sched_class = { | |||
| 1753 | .rq_offline = rq_offline_rt, | 1753 | .rq_offline = rq_offline_rt, |
| 1754 | .pre_schedule = pre_schedule_rt, | 1754 | .pre_schedule = pre_schedule_rt, |
| 1755 | .post_schedule = post_schedule_rt, | 1755 | .post_schedule = post_schedule_rt, |
| 1756 | .task_wake_up = task_wake_up_rt, | 1756 | .task_woken = task_woken_rt, |
| 1757 | .switched_from = switched_from_rt, | 1757 | .switched_from = switched_from_rt, |
| 1758 | #endif | 1758 | #endif |
| 1759 | 1759 | ||
