From patchwork Fri Nov 19 16:06:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rabin Vincent X-Patchwork-Id: 340391 X-Patchwork-Delegate: tony@atomide.com 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 oAJG7fV2032549 for ; Fri, 19 Nov 2010 16:07:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755358Ab0KSQHj (ORCPT ); Fri, 19 Nov 2010 11:07:39 -0500 Received: from mail-gy0-f174.google.com ([209.85.160.174]:37128 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755036Ab0KSQHj (ORCPT ); Fri, 19 Nov 2010 11:07:39 -0500 Received: by gyh4 with SMTP id 4so2771069gyh.19 for ; Fri, 19 Nov 2010 08:07:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:cc:subject :date:message-id:x-mailer; bh=0XfobXRweJsXKGXOEDyppt2fnmn3mx8oxwgg6AjxHss=; b=eUafVyyT0zIXaFf7ukUHzYYTvUGQJIKWNdEXhQPu+MLPFBdYmBbj7gG4hg4pFA+2D1 GCG+L/1RuUnt4zfy++/MKyCP6jyvU/Ay5e6vKZCUaXyl1CucLouDELnUU0LU9IlFS19t d/MQyKWQ9jJgkxqbxgeaBU7J2qlLB+PNeQWmU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; b=Yhtiz12jdblS9MrJID3WC9yo3rjCXB8P20lg2BcItYByZ17cvJyPs8UBUw7RjITUk6 CkZ3BrkYYRYGS8OhrVRNJ0FI7cgV1/wCtRgNKEkeJIJxgN7Mj13arjpDeDx8fyuxoF3v XJ8yDZQTAoN3RtZAuvhtftLChOfZyH6/b/efk= Received: by 10.100.46.16 with SMTP id t16mr1580631ant.186.1290182858347; Fri, 19 Nov 2010 08:07:38 -0800 (PST) Received: from localhost.localdomain ([59.164.103.248]) by mx.google.com with ESMTPS id b25sm1948514anb.23.2010.11.19.08.07.34 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 19 Nov 2010 08:07:37 -0800 (PST) From: Rabin Vincent To: linux-arm-kernel@lists.infradead.org Cc: Rabin Vincent , Tony Lindgren , linux-omap@vger.kernel.org Subject: [PATCH] ARM: omap: ensure sched_clock() is notrace Date: Fri, 19 Nov 2010 21:36:23 +0530 Message-Id: <1290182785-22352-2-git-send-email-rabin@rab.in> X-Mailer: git-send-email 1.7.2.3 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.3 (demeter1.kernel.org [140.211.167.41]); Fri, 19 Nov 2010 16:07:41 +0000 (UTC) diff --git a/arch/arm/plat-omap/counter_32k.c b/arch/arm/plat-omap/counter_32k.c index 155fe43..c542de3 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; } @@ -92,7 +93,7 @@ static cycle_t omap44xx_32k_read(struct clocksource *cs) * Kernel assumes that sched_clock can be called early but may not have * things ready yet. */ -static cycle_t omap_32k_read_dummy(struct clocksource *cs) +static cycle_t notrace omap_32k_read_dummy(struct clocksource *cs) { return 0; } diff --git a/arch/arm/plat-omap/io.c b/arch/arm/plat-omap/io.c index b0078cf..1b9a4c2 100644 --- a/arch/arm/plat-omap/io.c +++ b/arch/arm/plat-omap/io.c @@ -159,7 +159,7 @@ u16 omap_readw(u32 pa) } EXPORT_SYMBOL(omap_readw); -u32 omap_readl(u32 pa) +u32 notrace omap_readl(u32 pa) { if (cpu_class_is_omap1()) return __raw_readl(OMAP1_IO_ADDRESS(pa));