aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/cevt-r4k.c
diff options
context:
space:
mode:
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>2007-10-23 21:51:19 +0900
committerRalf Baechle <ralf@linux-mips.org>2007-10-29 19:35:35 +0000
commitc637fecb4fe67e2baccef24b9b7e9cb79ee23cf8 (patch)
tree810f5187068e12aacf7d69ddbdb63939dbf26864 /arch/mips/kernel/cevt-r4k.c
parent11ca25aa312d912c192ccfd5781669d794126118 (diff)
downloadkernel_samsung_espresso10-c637fecb4fe67e2baccef24b9b7e9cb79ee23cf8.zip
kernel_samsung_espresso10-c637fecb4fe67e2baccef24b9b7e9cb79ee23cf8.tar.gz
kernel_samsung_espresso10-c637fecb4fe67e2baccef24b9b7e9cb79ee23cf8.tar.bz2
[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/cevt-r4k.c')
-rw-r--r--arch/mips/kernel/cevt-r4k.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c
index cb46b02..7274fd2 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,
cnt = read_c0_count();
cnt += delta;
write_c0_compare(cnt);
- res = ((long)(read_c0_count() - cnt ) > 0) ? -ETIME : 0;
+ res = ((int)(read_c0_count() - cnt) > 0) ? -ETIME : 0;
#ifdef CONFIG_MIPS_MT_SMTC
evpe(vpflags);
local_irq_restore(flags);
@@ -196,7 +196,7 @@ static int c0_compare_int_usable(void)
cnt += delta;
write_c0_compare(cnt);
- while ((long)(read_c0_count() - cnt) <= 0)
+ while ((int)(read_c0_count() - cnt) <= 0)
; /* Wait for expiry */
if (!c0_compare_int_pending())