diff options
Diffstat (limited to 'kernel/sched/rt.c')
-rw-r--r-- | kernel/sched/rt.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 944cb68420e9..418feb01344e 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c | |||
@@ -691,6 +691,7 @@ balanced: | |||
691 | * runtime - in which case borrowing doesn't make sense. | 691 | * runtime - in which case borrowing doesn't make sense. |
692 | */ | 692 | */ |
693 | rt_rq->rt_runtime = RUNTIME_INF; | 693 | rt_rq->rt_runtime = RUNTIME_INF; |
694 | rt_rq->rt_throttled = 0; | ||
694 | raw_spin_unlock(&rt_rq->rt_runtime_lock); | 695 | raw_spin_unlock(&rt_rq->rt_runtime_lock); |
695 | raw_spin_unlock(&rt_b->rt_runtime_lock); | 696 | raw_spin_unlock(&rt_b->rt_runtime_lock); |
696 | } | 697 | } |
@@ -1631,11 +1632,6 @@ static int push_rt_task(struct rq *rq) | |||
1631 | if (!next_task) | 1632 | if (!next_task) |
1632 | return 0; | 1633 | return 0; |
1633 | 1634 | ||
1634 | #ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSW | ||
1635 | if (unlikely(task_running(rq, next_task))) | ||
1636 | return 0; | ||
1637 | #endif | ||
1638 | |||
1639 | retry: | 1635 | retry: |
1640 | if (unlikely(next_task == rq->curr)) { | 1636 | if (unlikely(next_task == rq->curr)) { |
1641 | WARN_ON(1); | 1637 | WARN_ON(1); |