From mboxrd@z Thu Jan  1 00:00:00 1970
From: rabin@rab.in (Rabin Vincent)
Date: Fri, 27 May 2011 21:03:57 +0530
Subject: [PATCH] OMAP: don't trace functions called from sched_clock
In-Reply-To: <1304846514-15641-1-git-send-email-rabin@rab.in>
References: <1304846514-15641-1-git-send-email-rabin@rab.in>
Message-ID: <BANLkTi=imJXEKriWdXOGE_wWWkQvdtLAHg@mail.gmail.com>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

Tony,

On Sun, May 8, 2011 at 14:51, Rabin Vincent <rabin@rab.in> wrote:
> omap_readl() is used from the sched_clock() implementations and so must
> be marked notrace to avoid recursion in ftrace. ?Same thing with
> mpu_read() for OMAP1.
>
> Signed-off-by: Rabin Vincent <rabin@rab.in>

Comments on this patch?  This is a bugfix; the function graph tracer
will crash and burn on OMAP without this.

> ---
> ?arch/arm/mach-omap1/io.c ? | ? ?2 +-
> ?arch/arm/mach-omap1/time.c | ? ?2 +-
> ?arch/arm/mach-omap2/io.c ? | ? ?2 +-
> ?3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c
> index 870886a..36ec2d7 100644
> --- a/arch/arm/mach-omap1/io.c
> +++ b/arch/arm/mach-omap1/io.c
> @@ -158,7 +158,7 @@ u16 omap_readw(u32 pa)
> ?}
> ?EXPORT_SYMBOL(omap_readw);
>
> -u32 omap_readl(u32 pa)
> +u32 notrace omap_readl(u32 pa)
> ?{
> ? ? ? ?return __raw_readl(OMAP1_IO_ADDRESS(pa));
> ?}
> diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c
> index 6885d2f..88c5c5e 100644
> --- a/arch/arm/mach-omap1/time.c
> +++ b/arch/arm/mach-omap1/time.c
> @@ -203,7 +203,7 @@ static struct irqaction omap_mpu_timer2_irq = {
> ? ? ? ?.handler ? ? ? ?= omap_mpu_timer2_interrupt,
> ?};
>
> -static cycle_t mpu_read(struct clocksource *cs)
> +static cycle_t notrace mpu_read(struct clocksource *cs)
> ?{
> ? ? ? ?return ~omap_mpu_timer_read(1);
> ?}
> diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
> index 441e79d..f1987b1 100644
> --- a/arch/arm/mach-omap2/io.c
> +++ b/arch/arm/mach-omap2/io.c
> @@ -441,7 +441,7 @@ u16 omap_readw(u32 pa)
> ?}
> ?EXPORT_SYMBOL(omap_readw);
>
> -u32 omap_readl(u32 pa)
> +u32 notrace omap_readl(u32 pa)
> ?{
> ? ? ? ?return __raw_readl(OMAP2_L4_IO_ADDRESS(pa));
> ?}
> --
> 1.7.4.1
>
>