* [PATCH][MIPS] fix the installation condition of MIPS clocksource
@ 2008-02-18 14:04 Yoichi Yuasa
2008-03-12 14:02 ` Ralf Baechle
0 siblings, 1 reply; 4+ messages in thread
From: Yoichi Yuasa @ 2008-02-18 14:04 UTC (permalink / raw)
To: Ralf Baechle; +Cc: yoichi_yuasa, linux-mips
Hi Ralf,
MIPS clocksource has been installed on DEC 5000/200(R3000).
The installation condition of MIPS clocksource is wrong.
Yoichi
Fixed the installation condition of MIPS clocksource.
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-02-14 12:00:11.592089539 +0900
+++ linux/arch/mips/kernel/time.c 2008-02-14 17:14:42.619488102 +0900
@@ -157,6 +157,6 @@ void __init time_init(void)
{
plat_time_init();
- if (mips_clockevent_init() || !cpu_has_mfc0_count_bug())
+ if (!cpu_has_mfc0_count_bug() && !mips_clockevent_init())
init_mips_clocksource();
}
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH][MIPS] fix the installation condition of MIPS clocksource
2008-02-18 14:04 [PATCH][MIPS] fix the installation condition of MIPS clocksource Yoichi Yuasa
@ 2008-03-12 14:02 ` Ralf Baechle
2008-03-12 14:50 ` Yoichi Yuasa
0 siblings, 1 reply; 4+ messages in thread
From: Ralf Baechle @ 2008-03-12 14:02 UTC (permalink / raw)
To: Yoichi Yuasa; +Cc: linux-mips
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,
Ralf
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH][MIPS] fix the installation condition of MIPS clocksource
2008-03-12 14:02 ` Ralf Baechle
@ 2008-03-12 14:50 ` Yoichi Yuasa
2008-03-17 13:05 ` Ralf Baechle
0 siblings, 1 reply; 4+ messages in thread
From: Yoichi Yuasa @ 2008-03-12 14:50 UTC (permalink / raw)
To: Ralf Baechle; +Cc: yoichi_yuasa, linux-mips
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();
}
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-03-17 13:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-18 14:04 [PATCH][MIPS] fix the installation condition of MIPS clocksource Yoichi Yuasa
2008-03-12 14:02 ` Ralf Baechle
2008-03-12 14:50 ` Yoichi Yuasa
2008-03-17 13:05 ` Ralf Baechle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox