diff options
Diffstat (limited to 'kernel/sched_rt.c')
-rw-r--r-- | kernel/sched_rt.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index f1f215db3bd0..2dac5ebb8bcb 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c | |||
@@ -1125,13 +1125,7 @@ static void watchdog(struct rq *rq, struct task_struct *p) | |||
1125 | 1125 | ||
1126 | p->rt.timeout++; | 1126 | p->rt.timeout++; |
1127 | next = DIV_ROUND_UP(min(soft, hard), USEC_PER_SEC/HZ); | 1127 | next = DIV_ROUND_UP(min(soft, hard), USEC_PER_SEC/HZ); |
1128 | if (next > p->rt.timeout) { | 1128 | if (p->rt.timeout > next) |
1129 | u64 next_time = p->se.sum_exec_runtime; | ||
1130 | |||
1131 | next_time += next * (NSEC_PER_SEC/HZ); | ||
1132 | if (p->it_sched_expires > next_time) | ||
1133 | p->it_sched_expires = next_time; | ||
1134 | } else | ||
1135 | p->it_sched_expires = p->se.sum_exec_runtime; | 1129 | p->it_sched_expires = p->se.sum_exec_runtime; |
1136 | } | 1130 | } |
1137 | } | 1131 | } |