diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-15 09:28:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-15 09:28:47 -0800 |
| commit | 1388c80438e69fc01d83fbe98da3cac24c3c8731 (patch) | |
| tree | 5014b653431a4b4fafb1e952dddf0ffcce9387a2 /kernel/sched/rt.c | |
| parent | e9e3b3002fc3c9ef665628bd85a8c1b5a3424f23 (diff) | |
| parent | 43d1b29b27c76e7454cd6c85bec4d0e9cbb039f3 (diff) | |
| download | linux-1388c80438e69fc01d83fbe98da3cac24c3c8731.tar.bz2 | |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar:
"Misc fixes:
- fix rq->lock lockdep annotation bug
- fix/improve update_curr_rt() and update_curr_dl() accounting
- update documentation
- remove unused macro"
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/cpufreq: Remove unused SUGOV_KTHREAD_PRIORITY macro
sched/core: Fix DEBUG_SPINLOCK annotation for rq->lock
sched/rt: Make update_curr_rt() more accurate
sched/deadline: Make update_curr_dl() more accurate
membarrier-sync-core: Document architecture support
Diffstat (limited to 'kernel/sched/rt.c')
| -rw-r--r-- | kernel/sched/rt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 663b2355a3aa..aad49451584e 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -950,12 +950,13 @@ static void update_curr_rt(struct rq *rq) { struct task_struct *curr = rq->curr; struct sched_rt_entity *rt_se = &curr->rt; - u64 now = rq_clock_task(rq); u64 delta_exec; + u64 now; if (curr->sched_class != &rt_sched_class) return; + now = rq_clock_task(rq); delta_exec = now - curr->se.exec_start; if (unlikely((s64)delta_exec <= 0)) return; |