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/plat-iop | |
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/plat-iop')
-rw-r--r-- | arch/arm/plat-iop/time.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c index 4332dc458ff9..d03a93295e60 100644 --- a/arch/arm/plat-iop/time.c +++ b/arch/arm/plat-iop/time.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/interrupt.h> | 17 | #include <linux/interrupt.h> |
18 | #include <linux/time.h> | 18 | #include <linux/time.h> |
19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
20 | #include <linux/sched.h> | ||
20 | #include <linux/timex.h> | 21 | #include <linux/timex.h> |
21 | #include <linux/io.h> | 22 | #include <linux/io.h> |
22 | #include <linux/clocksource.h> | 23 | #include <linux/clocksource.h> |
@@ -52,7 +53,7 @@ static struct clocksource iop_clocksource = { | |||
52 | /* | 53 | /* |
53 | * IOP sched_clock() implementation via its clocksource. | 54 | * IOP sched_clock() implementation via its clocksource. |
54 | */ | 55 | */ |
55 | unsigned long long sched_clock(void) | 56 | unsigned long long notrace sched_clock(void) |
56 | { | 57 | { |
57 | cycle_t cyc = iop_clocksource_read(NULL); | 58 | cycle_t cyc = iop_clocksource_read(NULL); |
58 | struct clocksource *cs = &iop_clocksource; | 59 | struct clocksource *cs = &iop_clocksource; |