From a3f62d4e2d386eb8de777baebf256f073ae5a2c3 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 18 Apr 2005 10:58:36 -0700 Subject: [PATCH] --- yaml --- r: 247 b: refs/heads/master c: 238628edb6cd427454fb54994e2605e191bfc26a h: refs/heads/master i: 245: ec04ef494de85e2a7dc0eccdebb7c8fb0e5a632a 243: e7b4ff654666a2ecc55ab1f679d7f082c766896c 239: 9b04e934f20c7f5054e0077305941064f9eac767 v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8b65d8e6e827..31a6f4bbd8f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a9947bf7a3a14d2107cb9a27279fc8f463370a9 +refs/heads/master: 238628edb6cd427454fb54994e2605e191bfc26a diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index f69c4a5361e3..9bb7489ee645 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -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; @@ -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)