From patchwork Sun May 8 09:21:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rabin Vincent X-Patchwork-Id: 765452 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p489Igew027882 for ; Sun, 8 May 2011 09:21:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752032Ab1EHJVc (ORCPT ); Sun, 8 May 2011 05:21:32 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:51458 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751803Ab1EHJVb (ORCPT ); Sun, 8 May 2011 05:21:31 -0400 Received: by pwi15 with SMTP id 15so1980958pwi.19 for ; Sun, 08 May 2011 02:21:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:cc:subject:date:message-id :x-mailer; bh=oDYtsz7YIR/0jwg8RbbwpY3az2qnBLwMxWJeKnLdu2M=; b=SZA5u0/esG2o/Tj8qG2sb+rnHZgax/TpzQhi/MIa4H48mVeuZo/pEWw9RvclLldl4B k74oBpmh9hwIRT0LVW1gQIiF/ns+XERKL9s/ugUWlihj0ky6P8J2apHbwM5cvo07jYti lJqXymaJwScpkqneBnjb4WGHVjzgXYOCYO5E4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; b=BZfD+JqYEp7NHdKtARX52PyfSsyTjh/255FlPH36rMeD4wUICBQDjzuYQ8UOOsYJqx S0YSr8TLqy5oJaOyDYEz34UWiz/fIdZaIEoAyqo931p4ZYhEMn9yHJLkPz9qYScxmcvO XBj0ZNGSKMM1bQ4QZZ8rR+LfWciPCJuShvssA= Received: by 10.68.22.3 with SMTP id z3mr7624186pbe.142.1304846491176; Sun, 08 May 2011 02:21:31 -0700 (PDT) Received: from localhost.localdomain ([59.164.193.33]) by mx.google.com with ESMTPS id y7sm3347422pbg.43.2011.05.08.02.21.26 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 08 May 2011 02:21:29 -0700 (PDT) From: Rabin Vincent To: tony@atomide.com Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Rabin Vincent Subject: [PATCH] OMAP: don't trace functions called from sched_clock Date: Sun, 8 May 2011 14:51:54 +0530 Message-Id: <1304846514-15641-1-git-send-email-rabin@rab.in> X-Mailer: git-send-email 1.7.4.1 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 08 May 2011 09:21:33 +0000 (UTC) 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 Acked-by: Kevin Hilman --- 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)); }