Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756002Ab0KLSoz (ORCPT ); Fri, 12 Nov 2010 13:44:55 -0500 Received: from mail-wy0-f174.google.com ([74.125.82.174]:36210 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932137Ab0KLSox convert rfc822-to-8bit (ORCPT ); Fri, 12 Nov 2010 13:44:53 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=kgICN4FbUkIMUNm31r8Li80dekJp6L8/7i0ynGiYfwo4Wk5W53rKv8DK3rJMjAwht5 PhSsg4pI8ESn7tz8hut4HsdcC2+tODA4qQKKIfmZf8PF0N5nAZTAAmyrsKK7dv8eiueP gVxL7FccIPPV3vGnF0UCSibRRUvfBfiMgHK9I= MIME-Version: 1.0 In-Reply-To: <1289067954-5080-1-git-send-email-rabin@rab.in> References: <1289067954-5080-1-git-send-email-rabin@rab.in> Date: Sat, 13 Nov 2010 00:14:51 +0530 X-Google-Sender-Auth: Hxfnr9dZAipmgI5yvv2ZzfzcNQc Message-ID: Subject: Re: [PATCH 1/6] ARM: ensure sched_clock() and children are notrace From: Rabin Vincent To: linux-arm-kernel@lists.infradead.org Cc: Steven Rostedt , Frederic Weisbecker , Tim Bird , linux-kernel@vger.kernel.org, Rabin Vincent , Colin Cross , Erik Gilling , Olof Johansson , Linus Walleij , Mikael Pettersson , Tony Lindgren Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6272 Lines: 178 CC'd some mach maintainers. I can split this up if needed, since these bits can be applied independently from the rest of the patches in the series. On Sat, Nov 6, 2010 at 11:55 PM, Rabin Vincent wrote: > Include sched.h in the files implementing sched_clock() and ensure that > any functions called from sched_clock() have the notrace annotation. > > Signed-off-by: Rabin Vincent > --- > ?arch/arm/mach-tegra/timer.c ? ? ? ? ? | ? ?3 ++- > ?arch/arm/mach-u300/timer.c ? ? ? ? ? ?| ? ?1 + > ?arch/arm/plat-iop/time.c ? ? ? ? ? ? ?| ? ?3 ++- > ?arch/arm/plat-nomadik/timer.c ? ? ? ? | ? ?5 +++-- > ?arch/arm/plat-omap/counter_32k.c ? ? ?| ? 11 ++++++----- > ?arch/arm/plat-versatile/sched-clock.c | ? ?1 + > ?6 files changed, 15 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/mach-tegra/timer.c b/arch/arm/mach-tegra/timer.c > index 9057d6f..88ed925 100644 > --- a/arch/arm/mach-tegra/timer.c > +++ b/arch/arm/mach-tegra/timer.c > @@ -21,6 +21,7 @@ > ?#include > ?#include > ?#include > +#include > ?#include > ?#include > ?#include > @@ -89,7 +90,7 @@ static void tegra_timer_set_mode(enum clock_event_mode mode, > ? ? ? ?} > ?} > > -static cycle_t tegra_clocksource_read(struct clocksource *cs) > +static cycle_t notrace tegra_clocksource_read(struct clocksource *cs) > ?{ > ? ? ? ?return cnt32_to_63(timer_readl(TIMERUS_CNTR_1US)); > ?} > diff --git a/arch/arm/mach-u300/timer.c b/arch/arm/mach-u300/timer.c > index 3fc4472..672b28a 100644 > --- a/arch/arm/mach-u300/timer.c > +++ b/arch/arm/mach-u300/timer.c > @@ -11,6 +11,7 @@ > ?#include > ?#include > ?#include > +#include > ?#include > ?#include > ?#include > diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c > index 85d3e55..558cdfa 100644 > --- a/arch/arm/plat-iop/time.c > +++ b/arch/arm/plat-iop/time.c > @@ -18,6 +18,7 @@ > ?#include > ?#include > ?#include > +#include > ?#include > ?#include > ?#include > @@ -36,7 +37,7 @@ > ?/* > ?* IOP clocksource (free-running timer 1). > ?*/ > -static cycle_t iop_clocksource_read(struct clocksource *unused) > +static cycle_t notrace iop_clocksource_read(struct clocksource *unused) > ?{ > ? ? ? ?return 0xffffffffu - read_tcr1(); > ?} > diff --git a/arch/arm/plat-nomadik/timer.c b/arch/arm/plat-nomadik/timer.c > index aedf9c1..70969a7 100644 > --- a/arch/arm/plat-nomadik/timer.c > +++ b/arch/arm/plat-nomadik/timer.c > @@ -11,6 +11,7 @@ > ?#include > ?#include > ?#include > +#include > ?#include > ?#include > ?#include > @@ -26,13 +27,13 @@ void __iomem *mtu_base; /* ssigned by machine code */ > ?* Kernel assumes that sched_clock can be called early > ?* but the MTU may not yet be initialized. > ?*/ > -static cycle_t nmdk_read_timer_dummy(struct clocksource *cs) > +static cycle_t notrace nmdk_read_timer_dummy(struct clocksource *cs) > ?{ > ? ? ? ?return 0; > ?} > > ?/* clocksource: MTU decrements, so we negate the value being read. */ > -static cycle_t nmdk_read_timer(struct clocksource *cs) > +static cycle_t notrace nmdk_read_timer(struct clocksource *cs) > ?{ > ? ? ? ?return -readl(mtu_base + MTU_VAL(0)); > ?} > diff --git a/arch/arm/plat-omap/counter_32k.c b/arch/arm/plat-omap/counter_32k.c > index 155fe43..bc9bc6c 100644 > --- a/arch/arm/plat-omap/counter_32k.c > +++ b/arch/arm/plat-omap/counter_32k.c > @@ -13,6 +13,7 @@ > ?* NOTE: This timer is not the same timer as the old OMAP1 MPU timer. > ?*/ > ?#include > +#include > ?#include > ?#include > ?#include > @@ -44,7 +45,7 @@ > ?static u32 offset_32k __read_mostly; > > ?#ifdef CONFIG_ARCH_OMAP16XX > -static cycle_t omap16xx_32k_read(struct clocksource *cs) > +static cycle_t notrace omap16xx_32k_read(struct clocksource *cs) > ?{ > ? ? ? ?return omap_readl(OMAP16XX_TIMER_32K_SYNCHRONIZED) - offset_32k; > ?} > @@ -53,7 +54,7 @@ static cycle_t omap16xx_32k_read(struct clocksource *cs) > ?#endif > > ?#ifdef CONFIG_ARCH_OMAP2420 > -static cycle_t omap2420_32k_read(struct clocksource *cs) > +static cycle_t notrace omap2420_32k_read(struct clocksource *cs) > ?{ > ? ? ? ?return omap_readl(OMAP2420_32KSYNCT_BASE + 0x10) - offset_32k; > ?} > @@ -62,7 +63,7 @@ static cycle_t omap2420_32k_read(struct clocksource *cs) > ?#endif > > ?#ifdef CONFIG_ARCH_OMAP2430 > -static cycle_t omap2430_32k_read(struct clocksource *cs) > +static cycle_t notrace omap2430_32k_read(struct clocksource *cs) > ?{ > ? ? ? ?return omap_readl(OMAP2430_32KSYNCT_BASE + 0x10) - offset_32k; > ?} > @@ -71,7 +72,7 @@ static cycle_t omap2430_32k_read(struct clocksource *cs) > ?#endif > > ?#ifdef CONFIG_ARCH_OMAP3 > -static cycle_t omap34xx_32k_read(struct clocksource *cs) > +static cycle_t notrace omap34xx_32k_read(struct clocksource *cs) > ?{ > ? ? ? ?return omap_readl(OMAP3430_32KSYNCT_BASE + 0x10) - offset_32k; > ?} > @@ -80,7 +81,7 @@ static cycle_t omap34xx_32k_read(struct clocksource *cs) > ?#endif > > ?#ifdef CONFIG_ARCH_OMAP4 > -static cycle_t omap44xx_32k_read(struct clocksource *cs) > +static cycle_t notrace omap44xx_32k_read(struct clocksource *cs) > ?{ > ? ? ? ?return omap_readl(OMAP4430_32KSYNCT_BASE + 0x10) - offset_32k; > ?} > diff --git a/arch/arm/plat-versatile/sched-clock.c b/arch/arm/plat-versatile/sched-clock.c > index 9768cf7..9696ddc 100644 > --- a/arch/arm/plat-versatile/sched-clock.c > +++ b/arch/arm/plat-versatile/sched-clock.c > @@ -20,6 +20,7 @@ > ?*/ > ?#include > ?#include > +#include > ?#include > > ?#include > -- > 1.7.2.3 > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/