diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 09:53:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 09:53:32 -0700 |
| commit | d54d14bfb49f0b61aed9f20cb84cb692566cf83b (patch) | |
| tree | ad09c5b88c4c641e3ad56b561ab29ab82de6555e /kernel/sched/deadline.c | |
| parent | mm: rmap: fix use-after-free in __put_anon_vma (diff) | |
| parent | sched/fair: Fix tg_set_cfs_bandwidth() deadlock on rq->lock (diff) | |
| download | linux-dev-d54d14bfb49f0b61aed9f20cb84cb692566cf83b.tar.xz linux-dev-d54d14bfb49f0b61aed9f20cb84cb692566cf83b.zip | |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar:
"Four misc fixes: each was deemed serious enough to warrant v3.15
inclusion"
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/fair: Fix tg_set_cfs_bandwidth() deadlock on rq->lock
sched/dl: Fix race in dl_task_timer()
sched: Fix sched_policy < 0 comparison
sched/numa: Fix use of spin_{un}lock_irq() when interrupts are disabled
Diffstat (limited to 'kernel/sched/deadline.c')
| -rw-r--r-- | kernel/sched/deadline.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index 800e99b99075..14bc348ba3b4 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -513,9 +513,17 @@ static enum hrtimer_restart dl_task_timer(struct hrtimer *timer) struct sched_dl_entity, dl_timer); struct task_struct *p = dl_task_of(dl_se); - struct rq *rq = task_rq(p); + struct rq *rq; +again: + rq = task_rq(p); raw_spin_lock(&rq->lock); + if (rq != task_rq(p)) { + /* Task was moved, retrying. */ + raw_spin_unlock(&rq->lock); + goto again; + } + /* * We need to take care of a possible races here. In fact, the * task might have changed its scheduling policy to something |