ftrace - add notrace to sched_clock on various arm platforms
Subsystems (6)
Arm (32-bit) Arm sub-architectures PXA2xx/PXA3xx support Arm/versatile express platform +2 more subsystems
PATCH 1/2 ftrace - add notrace to sched_clock on various arm platforms
Sorry - had wrong lists in original message.
Add notrace attribute to sched_clock, and
subsidiary clock routines, to avoid
recursion within ftrace.
Signed-off-by Tim Bird <[email protected]>
--- 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 | 14 +++++++------- arch/arm/plat-omap/io.c | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-)
arch/arm/mach-mmp/time.c +1 -1
@@ -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 ;
arch/arm/mach-pxa/time.c +1 -1
@@ -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 ;
arch/arm/mach-realview/core.c +1 -1
@@ -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;
arch/arm/mach-sa1100/generic.c +1 -1
@@ -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 );
arch/arm/mach-versatile/core.c +1 -1
@@ -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 ));
arch/arm/plat-omap/common.c +7 -7
@@ -101,7 +101,7 @@ EXPORT_SYMBOL(omap_get_var_config);#include <linux/clocksource.h> #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);
arch/arm/plat-omap/io.c +1 -1
@@ -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));