diff options
author | Ingo Molnar <mingo@elte.hu> | 2005-04-18 13:58:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-18 13:58:36 -0400 |
commit | 238628edb6cd427454fb54994e2605e191bfc26a (patch) | |
tree | 3225899173a2103cb7532551477d5c69e030f0ee /kernel | |
parent | 9a9947bf7a3a14d2107cb9a27279fc8f463370a9 (diff) |
[PATCH] sched: fix signed comparisons of long long
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-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 f69c4a5361e3..9bb7489ee645 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -2648,9 +2648,9 @@ need_resched_nonpreemptible: | |||
2648 | 2648 | ||
2649 | schedstat_inc(rq, sched_cnt); | 2649 | schedstat_inc(rq, sched_cnt); |
2650 | now = sched_clock(); | 2650 | now = sched_clock(); |
2651 | if (likely((long long)now - prev->timestamp < NS_MAX_SLEEP_AVG)) { | 2651 | if (likely((long long)(now - prev->timestamp) < NS_MAX_SLEEP_AVG)) { |
2652 | run_time = now - prev->timestamp; | 2652 | run_time = now - prev->timestamp; |
2653 | if (unlikely((long long)now - prev->timestamp < 0)) | 2653 | if (unlikely((long long)(now - prev->timestamp) < 0)) |
2654 | run_time = 0; | 2654 | run_time = 0; |
2655 | } else | 2655 | } else |
2656 | run_time = NS_MAX_SLEEP_AVG; | 2656 | run_time = NS_MAX_SLEEP_AVG; |
@@ -2728,7 +2728,7 @@ go_idle: | |||
2728 | 2728 | ||
2729 | if (!rt_task(next) && next->activated > 0) { | 2729 | if (!rt_task(next) && next->activated > 0) { |
2730 | unsigned long long delta = now - next->timestamp; | 2730 | unsigned long long delta = now - next->timestamp; |
2731 | if (unlikely((long long)now - next->timestamp < 0)) | 2731 | if (unlikely((long long)(now - next->timestamp) < 0)) |
2732 | delta = 0; | 2732 | delta = 0; |
2733 | 2733 | ||
2734 | if (next->activated == 1) | 2734 | if (next->activated == 1) |