diff options
author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2007-10-23 08:51:19 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-10-29 15:35:35 -0400 |
commit | c637fecb4fe67e2baccef24b9b7e9cb79ee23cf8 (patch) | |
tree | 810f5187068e12aacf7d69ddbdb63939dbf26864 /arch/mips/kernel | |
parent | 11ca25aa312d912c192ccfd5781669d794126118 (diff) |
[MIPS] time: Fix cevt-r4k.c for 64-bit kernel
The expression "(long)(read_c0_count() - cnt)" can never be a negative
value on 64-bit kernel. Cast to "int" before comparison.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r-- | arch/mips/kernel/cevt-r4k.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c index cb46b02e02a5..7274fd2513f9 100644 --- a/arch/mips/kernel/cevt-r4k.c +++ b/arch/mips/kernel/cevt-r4k.c | |||
@@ -28,7 +28,7 @@ static int mips_next_event(unsigned long delta, | |||
28 | cnt = read_c0_count(); | 28 | cnt = read_c0_count(); |
29 | cnt += delta; | 29 | cnt += delta; |
30 | write_c0_compare(cnt); | 30 | write_c0_compare(cnt); |
31 | res = ((long)(read_c0_count() - cnt ) > 0) ? -ETIME : 0; | 31 | res = ((int)(read_c0_count() - cnt) > 0) ? -ETIME : 0; |
32 | #ifdef CONFIG_MIPS_MT_SMTC | 32 | #ifdef CONFIG_MIPS_MT_SMTC |
33 | evpe(vpflags); | 33 | evpe(vpflags); |
34 | local_irq_restore(flags); | 34 | local_irq_restore(flags); |
@@ -196,7 +196,7 @@ static int c0_compare_int_usable(void) | |||
196 | cnt += delta; | 196 | cnt += delta; |
197 | write_c0_compare(cnt); | 197 | write_c0_compare(cnt); |
198 | 198 | ||
199 | while ((long)(read_c0_count() - cnt) <= 0) | 199 | while ((int)(read_c0_count() - cnt) <= 0) |
200 | ; /* Wait for expiry */ | 200 | ; /* Wait for expiry */ |
201 | 201 | ||
202 | if (!c0_compare_int_pending()) | 202 | if (!c0_compare_int_pending()) |