From: Rabin Vincent <rabin@rab.in>
Date: Sat, 4 Dec 2010 05:20:52 +0000 (+0100)
Subject: ARM: 6523/1: iop: ensure sched_clock() is notrace
X-Git-Tag: v2.6.37-rc5~4^2~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a5542a0f9aca5588a0afd0489c26d858405bfecb;p=~emulex%2Finfiniband.git

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>
---

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();
 }