diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-15 14:19:25 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 17:44:42 -0500 |
commit | 5e06b6492e53ab2a4e467763a9ee9f70b032c301 (patch) | |
tree | 6259d673f427d7194c6825bb1868ccf8b0ee21fe /arch/arm/mach-pxa | |
parent | 684e94cbcb5add60356d124166e40feb2174f0f1 (diff) |
ARM: ensure all sched_clock() implementations are notrace marked
ftrace requires sched_clock() to be notrace. Ensure that all
implementations are so marked. Also make sure that they include
linux/sched.h
Also ensure OMAP clocksource read functions are marked notrace as
they're used for sched_clock() too.
Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: Will Deacon <will.deacon@arm.com>
Tested-by: Mikael Pettersson <mikpe@it.uu.se>
Tested-by: Eric Miao <eric.y.miao@gmail.com>
Tested-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c index caf92c0bfba5..b8d9dff00ad1 100644 --- a/arch/arm/mach-pxa/time.c +++ b/arch/arm/mach-pxa/time.c | |||
@@ -51,7 +51,7 @@ static void __init set_oscr2ns_scale(unsigned long oscr_rate) | |||
51 | oscr2ns_scale++; | 51 | oscr2ns_scale++; |
52 | } | 52 | } |
53 | 53 | ||
54 | unsigned long long sched_clock(void) | 54 | unsigned long long notrace sched_clock(void) |
55 | { | 55 | { |
56 | unsigned long long v = cnt32_to_63(OSCR); | 56 | unsigned long long v = cnt32_to_63(OSCR); |
57 | return (v * oscr2ns_scale) >> OSCR2NS_SCALE_FACTOR; | 57 | return (v * oscr2ns_scale) >> OSCR2NS_SCALE_FACTOR; |