diff options
| author | Rabin Vincent <rabin@rab.in> | 2010-12-04 00:20:52 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-04 08:36:29 -0500 |
| commit | a5542a0f9aca5588a0afd0489c26d858405bfecb (patch) | |
| tree | f96fc85e1a1cfaf962a10323799acc665edd3ec0 | |
| parent | b9f515e3e3861abbaa093359f7c6f31283695228 (diff) | |
ARM: 6523/1: iop: ensure sched_clock() is notrace
Include sched.h to ensure sched_clock() has the notrace
annotation, and mark any functions it calls as notrace
too.
Include sched.h to ensure sched_clock() has the notrace
annotation, and mark any functions it calls as notrace
too.
Acked-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -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 85d3e55ca4a..558cdfaf76b 100644 --- a/arch/arm/plat-iop/time.c +++ b/arch/arm/plat-iop/time.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/time.h> | 18 | #include <linux/time.h> |
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/timex.h> | 20 | #include <linux/timex.h> |
| 21 | #include <linux/sched.h> | ||
| 21 | #include <linux/io.h> | 22 | #include <linux/io.h> |
| 22 | #include <linux/clocksource.h> | 23 | #include <linux/clocksource.h> |
| 23 | #include <linux/clockchips.h> | 24 | #include <linux/clockchips.h> |
| @@ -36,7 +37,7 @@ | |||
| 36 | /* | 37 | /* |
| 37 | * IOP clocksource (free-running timer 1). | 38 | * IOP clocksource (free-running timer 1). |
| 38 | */ | 39 | */ |
| 39 | static cycle_t iop_clocksource_read(struct clocksource *unused) | 40 | static cycle_t notrace iop_clocksource_read(struct clocksource *unused) |
| 40 | { | 41 | { |
| 41 | return 0xffffffffu - read_tcr1(); | 42 | return 0xffffffffu - read_tcr1(); |
| 42 | } | 43 | } |
