Hi, On Nov 26, 2007 3:51 PM, Dirk Behme <dirk.behme@xxxxxxxxxxxxxx> wrote: > Felipe Balbi wrote: > > After commit 6e0d7b9283a5b91bf2c2adc7801e426fd563bc13 building > > is broken for omap1 archs due to double definition of sched_clock(). > > > > sched_clock() has moved to plat-omap/common.c so it's ok removing it > > from mach-omap1/time.c > > While trying to find this patch in list archive, I found that you sent > it only to our new list at vger.kernel.org [1]. Nice, now I'm sure > that mails from that list reach me as well ;) But we have no archive > there yet. So for some time I think CC to > Linux-omap-open-source@xxxxxxxxxxxxxx would be good as well. Ok, thanks > > Regards > > Dirk > > [1] http://vger.kernel.org/vger-lists.html#linux-omap > > > Signed-off-by: Felipe Balbi <felipe.lima@xxxxxxxxxxx> > > --- > > arch/arm/mach-omap1/time.c | 15 --------------- > > 1 files changed, 0 insertions(+), 15 deletions(-) > > > > diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c > > index a4f8b20..872b965 100644 > > --- a/arch/arm/mach-omap1/time.c > > +++ b/arch/arm/mach-omap1/time.c > > @@ -262,21 +262,6 @@ static void __init omap_init_clocksource(unsigned long rate) > > > > > > /* > > - * Scheduler clock - returns current time in nanosec units. > > - */ > > -unsigned long long sched_clock(void) > > -{ > > - unsigned long ticks = 0 - omap_mpu_timer_read(1); > > - unsigned long long ticks64; > > - > > - ticks64 = omap_mpu_timer2_overflows; > > - ticks64 <<= 32; > > - ticks64 |= ticks; > > - > > - return cycles_2_ns(ticks64); > > -} > > - > > -/* > > * --------------------------------------------------------------------------- > > * Timer initialization > > * --------------------------------------------------------------------------- > > _______________________________________________ > Linux-omap-open-source mailing list > Linux-omap-open-source@xxxxxxxxxxxxxx > http://linux.omap.com/mailman/listinfo/linux-omap-open-source > -- Best Regards, Felipe Balbi felipebalbi@xxxxxxxxxxxxxxxxxxxxx - To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
