diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2015-02-04 07:44:00 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-04 07:44:00 +0100 |
| commit | 4c195c8a1967ff8bee13a811518a99db04618ab7 (patch) | |
| tree | 555682bd243ac56920ef7a2f3c1f3b666996c7b3 /kernel/sched/deadline.c | |
| parent | sched/deadline: Modify cpudl::free_cpus to reflect rd->online (diff) | |
| parent | sched/deadline: Fix deadline parameter modification handling (diff) | |
| download | linux-dev-4c195c8a1967ff8bee13a811518a99db04618ab7.tar.xz linux-dev-4c195c8a1967ff8bee13a811518a99db04618ab7.zip | |
Merge branch 'sched/urgent' into sched/core, to merge fixes before applying new patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | kernel/sched/deadline.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index e7b272233c5c..e0e9c2986976 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -1094,6 +1094,7 @@ static void task_dead_dl(struct task_struct *p) * Since we are TASK_DEAD we won't slip out of the domain! */ raw_spin_lock_irq(&dl_b->lock); + /* XXX we should retain the bw until 0-lag */ dl_b->total_bw -= p->dl.dl_bw; raw_spin_unlock_irq(&dl_b->lock); @@ -1613,8 +1614,8 @@ static void cancel_dl_timer(struct rq *rq, struct task_struct *p) static void switched_from_dl(struct rq *rq, struct task_struct *p) { + /* XXX we should retain the bw until 0-lag */ cancel_dl_timer(rq, p); - __dl_clear_params(p); /* |