linux-mips
[Top] [All Lists]

[PATCH][MIPS] fix the installation condition of MIPS clocksource

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH][MIPS] fix the installation condition of MIPS clocksource
From: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Date: Wed, 12 Mar 2008 23:50:02 +0900
Cc: yoichi_yuasa@tripeaks.co.jp, linux-mips <linux-mips@linux-mips.org>
In-reply-to: <20080312140201.GA25986@linux-mips.org>
Organization: TriPeaks Corporation
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <20080218230459.35c2204b.yoichi_yuasa@tripeaks.co.jp> <20080312140201.GA25986@linux-mips.org>
Sender: linux-mips-bounce@linux-mips.org
Hi Ralf,

On Wed, 12 Mar 2008 14:02:01 +0000
Ralf Baechle <ralf@linux-mips.org> wrote:

> On Mon, Feb 18, 2008 at 11:04:59PM +0900, Yoichi Yuasa wrote:
> 
> > MIPS clocksource has been installed on DEC 5000/200(R3000).
> > The installation condition of MIPS clocksource is wrong.
> 
> A bug indeed but I figured it was cleaner to have init_mips_clocksource()
> itself check for the presence of an r4k style counter like other
> device initialitation functions.  So I went for a different fix for
> both 2.6.24 and master.
> 
> Thanks for raising the issue,

I think it has a one more bug.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

diff -pruN -X /home/yuasa/Memo/dontdiff linux-orig/arch/mips/kernel/time.c 
linux/arch/mips/kernel/time.c
--- linux-orig/arch/mips/kernel/time.c  2008-03-12 23:42:37.492242141 +0900
+++ linux/arch/mips/kernel/time.c       2008-03-12 23:44:47.819669076 +0900
@@ -157,6 +157,6 @@ void __init time_init(void)
 {
        plat_time_init();
 
-       if (mips_clockevent_init() || !cpu_has_mfc0_count_bug())
+       if (!mips_clockevent_init() || !cpu_has_mfc0_count_bug())
                init_mips_clocksource();
 }

<Prev in Thread] Current Thread [Next in Thread>