Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 247
b: refs/heads/master
c: 238628e
h: refs/heads/master
i:
  245: ec04ef4
  243: e7b4ff6
  239: 9b04e93
v: v3
  • Loading branch information
Ingo Molnar authored and Linus Torvalds committed Apr 18, 2005
1 parent 4a765a9 commit a3f62d4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9a9947bf7a3a14d2107cb9a27279fc8f463370a9
refs/heads/master: 238628edb6cd427454fb54994e2605e191bfc26a
6 changes: 3 additions & 3 deletions trunk/kernel/sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -2648,9 +2648,9 @@ asmlinkage void __sched schedule(void)

schedstat_inc(rq, sched_cnt);
now = sched_clock();
if (likely((long long)now - prev->timestamp < NS_MAX_SLEEP_AVG)) {
if (likely((long long)(now - prev->timestamp) < NS_MAX_SLEEP_AVG)) {
run_time = now - prev->timestamp;
if (unlikely((long long)now - prev->timestamp < 0))
if (unlikely((long long)(now - prev->timestamp) < 0))
run_time = 0;
} else
run_time = NS_MAX_SLEEP_AVG;
Expand Down Expand Up @@ -2728,7 +2728,7 @@ asmlinkage void __sched schedule(void)

if (!rt_task(next) && next->activated > 0) {
unsigned long long delta = now - next->timestamp;
if (unlikely((long long)now - next->timestamp < 0))
if (unlikely((long long)(now - next->timestamp) < 0))
delta = 0;

if (next->activated == 1)
Expand Down

0 comments on commit a3f62d4

Please sign in to comment.