diff options
author | James Bottomley <jejb@titanic> | 2005-04-18 20:55:09 -0500 |
---|---|---|
committer | James Bottomley <jejb@titanic> | 2005-04-18 20:55:09 -0500 |
commit | c0698f2f6e4839ce9463ce731c892993215ea067 (patch) | |
tree | b05fc8a950ace937460212e996441e4c05a227f6 /kernel/sched.c | |
parent | cb624029cab62e5415287d15b2ec907b8f322ff5 (diff) | |
parent | 7f907d7486f2519c2ff1493bfbcdc36dcacd85b7 (diff) |
fully merge up to scsi-misc-2.6
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index f69c4a5361e..9bb7489ee64 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -2648,9 +2648,9 @@ need_resched_nonpreemptible: 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; @@ -2728,7 +2728,7 @@ go_idle: 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) |