From patchwork Sat Mar 6 00:36:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Bird X-Patchwork-Id: 83866 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o260aFm6004162 for ; Sat, 6 Mar 2010 00:36:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751557Ab0CFAgO (ORCPT ); Fri, 5 Mar 2010 19:36:14 -0500 Received: from va3ehsobe005.messaging.microsoft.com ([216.32.180.15]:14470 "EHLO VA3EHSOBE006.bigfish.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751289Ab0CFAgN (ORCPT ); Fri, 5 Mar 2010 19:36:13 -0500 Received: from mail103-va3-R.bigfish.com (10.7.14.243) by VA3EHSOBE006.bigfish.com (10.7.40.26) with Microsoft SMTP Server id 8.1.240.5; Sat, 6 Mar 2010 00:36:13 +0000 Received: from mail103-va3 (localhost [127.0.0.1]) by mail103-va3-R.bigfish.com (Postfix) with ESMTP id 0B814DA076E; Sat, 6 Mar 2010 00:36:13 +0000 (UTC) X-SpamScore: 0 X-BigFish: VPS0(zzab9bhzz1202hz4fhzz2fh2a8h6bh61h) X-Spam-TCS-SCL: 0:0 Received: from mail103-va3 (localhost.localdomain [127.0.0.1]) by mail103-va3 (MessageSwitch) id 126783577159300_12783; Sat, 6 Mar 2010 00:36:11 +0000 (UTC) Received: from VA3EHSMHS032.bigfish.com (unknown [10.7.14.236]) by mail103-va3.bigfish.com (Postfix) with ESMTP id 0A6A41398050; Sat, 6 Mar 2010 00:36:11 +0000 (UTC) Received: from mail7.fw-bc.sony.com (160.33.98.74) by VA3EHSMHS032.bigfish.com (10.7.99.42) with Microsoft SMTP Server (TLS) id 14.0.482.39; Sat, 6 Mar 2010 00:36:10 +0000 Received: from mail1.sgo.in.sel.sony.com (mail1.sgo.in.sel.sony.com [43.130.1.111]) by mail7.fw-bc.sony.com (Switch-3.4.2/Switch-3.4.2) with ESMTP id o260a9HE022105 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 6 Mar 2010 00:36:10 GMT Received: from timdesk.am.sony.com ([43.135.148.222]) by mail1.sgo.in.sel.sony.com (8.12.11/8.12.11) with ESMTP id o260a8VM026939; Sat, 6 Mar 2010 00:36:08 GMT Message-ID: <4B91A378.2060209@am.sony.com> Date: Fri, 5 Mar 2010 16:36:08 -0800 From: Tim Bird User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.8) Gecko/20100301 Fedora/3.0.3-1.fc12 Thunderbird/3.0.3 MIME-Version: 1.0 To: "linux-arm-kernel@lists.infradead.org" , linux-omap Subject: [PATCH 1/2] ftrace - add notrace to sched_clock on various arm platforms X-Reverse-DNS: mail7.fw-bc.sony.com 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 (demeter.kernel.org [140.211.167.41]); Sat, 06 Mar 2010 00:36:15 +0000 (UTC) --- a/arch/arm/mach-mmp/time.c +++ b/arch/arm/mach-mmp/time.c @@ -72,7 +72,7 @@ static inline uint32_t timer_read(void) return __raw_readl(TIMERS_VIRT_BASE + TMR_CVWR(0)); } -unsigned long long sched_clock(void) +unsigned long long notrace sched_clock(void) { unsigned long long v = cnt32_to_63(timer_read()); return (v * tcr2ns_scale) >> TCR2NS_SCALE_FACTOR; --- a/arch/arm/mach-pxa/time.c +++ b/arch/arm/mach-pxa/time.c @@ -51,7 +51,7 @@ static void __init set_oscr2ns_scale(uns oscr2ns_scale++; } -unsigned long long sched_clock(void) +unsigned long long notrace sched_clock(void) { unsigned long long v = cnt32_to_63(OSCR); return (v * oscr2ns_scale) >> OSCR2NS_SCALE_FACTOR; --- a/arch/arm/mach-realview/core.c +++ b/arch/arm/mach-realview/core.c @@ -82,7 +82,7 @@ void __init realview_adjust_zones(int no * This is the RealView sched_clock implementation. This has * a resolution of 41.7ns, and a maximum value of about 179s. */ -unsigned long long sched_clock(void) +unsigned long long notrace sched_clock(void) { unsigned long long v; --- a/arch/arm/mach-sa1100/generic.c +++ b/arch/arm/mach-sa1100/generic.c @@ -119,7 +119,7 @@ unsigned int sa11x0_getspeed(unsigned in * * ( * 1E9 / 3686400 => * 78125 / 288) */ -unsigned long long sched_clock(void) +unsigned long long notrace sched_clock(void) { unsigned long long v = cnt32_to_63(OSCR); --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c @@ -238,7 +238,7 @@ void __init versatile_map_io(void) * long as there is always less than 89 seconds between successive * calls to this function. */ -unsigned long long sched_clock(void) +unsigned long long notrace sched_clock(void) { unsigned long long v = cnt32_to_63(readl(VERSATILE_REFCOUNTER)); --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -101,7 +101,7 @@ EXPORT_SYMBOL(omap_get_var_config); #include #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); } @@ -110,7 +110,7 @@ static cycle_t omap16xx_32k_read(struct #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); } @@ -119,7 +119,7 @@ static cycle_t omap2420_32k_read(struct #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); } @@ -128,7 +128,7 @@ static cycle_t omap2430_32k_read(struct #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); } @@ -137,7 +137,7 @@ static cycle_t omap34xx_32k_read(struct #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); } @@ -149,7 +149,7 @@ static cycle_t omap44xx_32k_read(struct * 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; } @@ -167,7 +167,7 @@ static struct clocksource clocksource_32 * Returns current time from boot in nsecs. It's OK for this to wrap * around for now, as it's just a relative time stamp. */ -unsigned long long sched_clock(void) +unsigned long long notrace sched_clock(void) { return clocksource_cyc2ns(clocksource_32k.read(&clocksource_32k), clocksource_32k.mult, clocksource_32k.shift); --- 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));