diff options
author | Ingo Molnar <mingo@elte.hu> | 2007-09-05 08:32:49 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2007-09-05 08:32:49 -0400 |
commit | cf2ab4696ee42f895eed88c2b6e432fe03dda0db (patch) | |
tree | 75c58340b1b72e0d060fd3a07142c54b7ac442c8 /kernel | |
parent | 2491b2b89d4646e02ab51c90ab7012d124924ddc (diff) |
sched: fix xtensa build warning
rename RSR to SRR - 'RSR' is already defined on xtensa.
found by Adrian Bunk.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 97986f1f0be8..deeb1f8e0c30 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -668,7 +668,7 @@ static u64 div64_likely32(u64 divident, unsigned long divisor) | |||
668 | /* | 668 | /* |
669 | * Shift right and round: | 669 | * Shift right and round: |
670 | */ | 670 | */ |
671 | #define RSR(x, y) (((x) + (1UL << ((y) - 1))) >> (y)) | 671 | #define SRR(x, y) (((x) + (1UL << ((y) - 1))) >> (y)) |
672 | 672 | ||
673 | static unsigned long | 673 | static unsigned long |
674 | calc_delta_mine(unsigned long delta_exec, unsigned long weight, | 674 | calc_delta_mine(unsigned long delta_exec, unsigned long weight, |
@@ -684,10 +684,10 @@ calc_delta_mine(unsigned long delta_exec, unsigned long weight, | |||
684 | * Check whether we'd overflow the 64-bit multiplication: | 684 | * Check whether we'd overflow the 64-bit multiplication: |
685 | */ | 685 | */ |
686 | if (unlikely(tmp > WMULT_CONST)) | 686 | if (unlikely(tmp > WMULT_CONST)) |
687 | tmp = RSR(RSR(tmp, WMULT_SHIFT/2) * lw->inv_weight, | 687 | tmp = SRR(SRR(tmp, WMULT_SHIFT/2) * lw->inv_weight, |
688 | WMULT_SHIFT/2); | 688 | WMULT_SHIFT/2); |
689 | else | 689 | else |
690 | tmp = RSR(tmp * lw->inv_weight, WMULT_SHIFT); | 690 | tmp = SRR(tmp * lw->inv_weight, WMULT_SHIFT); |
691 | 691 | ||
692 | return (unsigned long)min(tmp, (u64)(unsigned long)LONG_MAX); | 692 | return (unsigned long)min(tmp, (u64)(unsigned long)LONG_MAX); |
693 | } | 693 | } |