From 295ef0c5e6e3e18793ca53d13c32eba2bce196cc Mon Sep 17 00:00:00 2001 From: Atsushi Nemoto Date: Tue, 23 Oct 2007 21:51:19 +0900 Subject: [PATCH] --- yaml --- r: 72784 b: refs/heads/master c: c637fecb4fe67e2baccef24b9b7e9cb79ee23cf8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/kernel/cevt-r4k.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4b9aefdec5a4..968a106b18a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11ca25aa312d912c192ccfd5781669d794126118 +refs/heads/master: c637fecb4fe67e2baccef24b9b7e9cb79ee23cf8 diff --git a/trunk/arch/mips/kernel/cevt-r4k.c b/trunk/arch/mips/kernel/cevt-r4k.c index cb46b02e02a5..7274fd2513f9 100644 --- a/trunk/arch/mips/kernel/cevt-r4k.c +++ b/trunk/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())