From a5542a0f9aca5588a0afd0489c26d858405bfecb Mon Sep 17 00:00:00 2001 From: Rabin Vincent Date: Sat, 4 Dec 2010 06:20:52 +0100 Subject: [PATCH] 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 Signed-off-by: Rabin Vincent Signed-off-by: Russell King --- arch/arm/plat-iop/time.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 @@ #include #include #include +#include #include #include #include @@ -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(); } -- 2.20.1