diff options
| author | Rabin Vincent <rabin@rab.in> | 2010-12-04 06:20:52 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-04 13:36:29 +0000 |
| commit | a5542a0f9aca5588a0afd0489c26d858405bfecb (patch) | |
| tree | f96fc85e1a1cfaf962a10323799acc665edd3ec0 /arch/arm | |
| parent | b9f515e3e3861abbaa093359f7c6f31283695228 (diff) | |
| download | kernel_samsung_crespo-a5542a0f9aca5588a0afd0489c26d858405bfecb.zip kernel_samsung_crespo-a5542a0f9aca5588a0afd0489c26d858405bfecb.tar.gz kernel_samsung_crespo-a5542a0f9aca5588a0afd0489c26d858405bfecb.tar.bz2 | |
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>
Diffstat (limited to 'arch/arm')
| -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 85d3e55..558cdfa 100644 --- a/arch/arm/plat-iop/time.c +++ b/arch/arm/plat-iop/time.c @@ -18,6 +18,7 @@ #include <linux/time.h> #include <linux/init.h> #include <linux/timex.h> +#include <linux/sched.h> #include <linux/io.h> #include <linux/clocksource.h> #include <linux/clockchips.h> @@ -36,7 +37,7 @@ /* * IOP clocksource (free-running timer 1). */ -static cycle_t iop_clocksource_read(struct clocksource *unused) +static cycle_t notrace iop_clocksource_read(struct clocksource *unused) { return 0xffffffffu - read_tcr1(); } |