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-tegra | |
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-tegra')
-rw-r--r-- | arch/arm/mach-tegra/timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/timer.c b/arch/arm/mach-tegra/timer.c index b49f2f5025f2..c52bd84652e5 100644 --- a/arch/arm/mach-tegra/timer.c +++ b/arch/arm/mach-tegra/timer.c | |||
@@ -18,6 +18,7 @@ | |||
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
21 | #include <linux/sched.h> | ||
21 | #include <linux/time.h> | 22 | #include <linux/time.h> |
22 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
23 | #include <linux/irq.h> | 24 | #include <linux/irq.h> |
@@ -110,7 +111,7 @@ static struct clocksource tegra_clocksource = { | |||
110 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 111 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
111 | }; | 112 | }; |
112 | 113 | ||
113 | unsigned long long sched_clock(void) | 114 | unsigned long long notrace sched_clock(void) |
114 | { | 115 | { |
115 | return cnt32_to_63(timer_readl(TIMERUS_CNTR_1US)) * 1000; | 116 | return cnt32_to_63(timer_readl(TIMERUS_CNTR_1US)) * 1000; |
116 | } | 117 | } |