From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dirk Behme Subject: Re: [PATCH] ARM: OMAP: MACH-OMAP1: Fix compilation issues for OMAP1 Date: Mon, 26 Nov 2007 20:51:00 +0100 Message-ID: <474B23A4.7090902@googlemail.com> References: <1196092220-6633-1-git-send-email-felipe.lima@indt.org.br> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1196092220-6633-1-git-send-email-felipe.lima@indt.org.br> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-omap-open-source-bounces+gplao-linux-omap-open-source=gmane.org@linux.omap.com Errors-To: linux-omap-open-source-bounces+gplao-linux-omap-open-source=gmane.org@linux.omap.com To: Felipe Balbi Cc: linux-omap@vger.kernel.org, OMAP List-Id: linux-omap@vger.kernel.org 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@linux.omap.com would be good as well. Regards Dirk [1] http://vger.kernel.org/vger-lists.html#linux-omap > Signed-off-by: Felipe Balbi > --- > 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 > * ---------------------------------------------------------------------------