From 17c229f9d6da80e1c5e14c87e2b563ff460d6502 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 5 Sep 2007 14:32:49 +0200 Subject: [PATCH] --- yaml --- r: 64725 b: refs/heads/master c: cf2ab4696ee42f895eed88c2b6e432fe03dda0db h: refs/heads/master i: 64723: 4cc67df68d73d9387834c3e28e8e37a4e705afe9 v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1c12c478dd87..afa3b1d3dfcf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2491b2b89d4646e02ab51c90ab7012d124924ddc +refs/heads/master: cf2ab4696ee42f895eed88c2b6e432fe03dda0db diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 97986f1f0be8..deeb1f8e0c30 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -668,7 +668,7 @@ static u64 div64_likely32(u64 divident, unsigned long divisor) /* * Shift right and round: */ -#define RSR(x, y) (((x) + (1UL << ((y) - 1))) >> (y)) +#define SRR(x, y) (((x) + (1UL << ((y) - 1))) >> (y)) static unsigned long calc_delta_mine(unsigned long delta_exec, unsigned long weight, @@ -684,10 +684,10 @@ calc_delta_mine(unsigned long delta_exec, unsigned long weight, * Check whether we'd overflow the 64-bit multiplication: */ if (unlikely(tmp > WMULT_CONST)) - tmp = RSR(RSR(tmp, WMULT_SHIFT/2) * lw->inv_weight, + tmp = SRR(SRR(tmp, WMULT_SHIFT/2) * lw->inv_weight, WMULT_SHIFT/2); else - tmp = RSR(tmp * lw->inv_weight, WMULT_SHIFT); + tmp = SRR(tmp * lw->inv_weight, WMULT_SHIFT); return (unsigned long)min(tmp, (u64)(unsigned long)LONG_MAX); }