aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRabin Vincent <rabin@rab.in>2010-12-04 06:20:52 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-12-04 13:36:29 +0000
commita5542a0f9aca5588a0afd0489c26d858405bfecb (patch)
treef96fc85e1a1cfaf962a10323799acc665edd3ec0 /arch
parentb9f515e3e3861abbaa093359f7c6f31283695228 (diff)
downloadmrst-s0i3-test-a5542a0f9aca5588a0afd0489c26d858405bfecb.tar.gz
mrst-s0i3-test-a5542a0f9aca5588a0afd0489c26d858405bfecb.tar.xz
mrst-s0i3-test-a5542a0f9aca5588a0afd0489c26d858405bfecb.zip
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')
-rw-r--r--arch/arm/plat-iop/time.c3
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 @@
#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();
}