---

yaml --- r: 179154 b: refs/heads/master c: c6a3c85 h: refs/heads/master v: v3
git-mirror · Jan 12, 2010 · 6afbca6 · 6afbca6
1 parent 9a3a65e
commit 6afbca6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98bea6fc87390b6a12f595ad06fc686712435f94
+refs/heads/master: c6a3c851a287980e47b45bf191a3b78d9d8508e2
diff --git a/trunk/arch/mips/cavium-octeon/csrc-octeon.c b/trunk/arch/mips/cavium-octeon/csrc-octeon.c
@@ -50,6 +50,13 @@ static struct clocksource clocksource_mips = {
 	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
+unsigned long long notrace sched_clock(void)
+{
+	return clocksource_cyc2ns(read_c0_cvmcount(),
+				  clocksource_mips.mult,
+				  clocksource_mips.shift);
+}
+
 void __init plat_time_init(void)
 {
 	clocksource_mips.rating = 300;