From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934159AbZFLWIl (ORCPT ); Fri, 12 Jun 2009 18:08:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759151AbZFLWIc (ORCPT ); Fri, 12 Jun 2009 18:08:32 -0400 Received: from wa4ehsobe005.messaging.microsoft.com ([216.32.181.15]:25862 "EHLO WA4EHSOBE006.bigfish.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753831AbZFLWIc (ORCPT ); Fri, 12 Jun 2009 18:08:32 -0400 X-SpamScore: 6 X-BigFish: VPS6(z37d5nzzz1202hzzz2fh6bh17ch67h) X-Spam-TCS-SCL: 6:0 Message-ID: <4A32D1AF.7060107@am.sony.com> Date: Fri, 12 Jun 2009 15:07:43 -0700 From: Tim Bird User-Agent: Thunderbird 2.0.0.14 (X11/20080501) MIME-Version: 1.0 To: linux-arm-kernel , linux kernel , Russell King , Steven Rostedt , Ingo Molnar , Tony Lindgren Subject: [PATCH] ftrace,arm: add notrace to ARM sched_clock routines - resend Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 12 Jun 2009 22:07:44.0334 (UTC) FILETIME=[36376EE0:01C9EBAA] X-SEL-encryption-scan: scanned Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add notrace attribute to sched_clock, to avoid recursion with ftrace function tracing. Signed-off-by: Tim Bird --- arch/arm/mach-mmp/time.c | 2 +- arch/arm/mach-pxa/time.c | 2 +- arch/arm/mach-realview/core.c | 2 +- arch/arm/mach-sa1100/generic.c | 2 +- arch/arm/mach-versatile/core.c | 2 +- arch/arm/plat-omap/common.c | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) --- 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 @@ -60,7 +60,7 @@ void __iomem *gic_cpu_base_addr; * 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 @@ -131,7 +131,7 @@ EXPORT_SYMBOL(cpufreq_get); * * ( * 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 @@ -237,7 +237,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 @@ -185,7 +185,7 @@ console_initcall(omap_add_serial_console #include -static cycle_t omap_32k_read(struct clocksource *cs) +static cycle_t notrace omap_32k_read(struct clocksource *cs) { return omap_readl(TIMER_32K_SYNCHRONIZED); } @@ -203,7 +203,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) { unsigned long long ret;