---

yaml --- r: 222959 b: refs/heads/master c: a5542a0 h: refs/heads/master i: 222957: b31d8d2 222955: 9179c7d 222951: a2b386c 222943: 78de54d v: v3
git-mirror · Dec 4, 2010 · f63f619 · f63f619
1 parent 9e17c4b
commit f63f619
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9f515e3e3861abbaa093359f7c6f31283695228
+refs/heads/master: a5542a0f9aca5588a0afd0489c26d858405bfecb
diff --git a/trunk/arch/arm/plat-iop/time.c b/trunk/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();
 }