From 6afbca6f98980d5d4a70cfe858082aca1f838da3 Mon Sep 17 00:00:00 2001
From: David Daney <ddaney@caviumnetworks.com>
Date: Wed, 23 Dec 2009 13:18:54 -0800
Subject: [PATCH] --- yaml --- r: 179154 b: refs/heads/master c:
 c6a3c851a287980e47b45bf191a3b78d9d8508e2 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/mips/cavium-octeon/csrc-octeon.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ac1344207bfc..97d3d74354dc 100644
--- 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
index 96110f217dcd..96df821fbd81 100644
--- 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;