---

yaml --- r: 96454 b: refs/heads/master c: cfd28f6 h: refs/heads/master v: v3
git-mirror · May 13, 2008 · 3530931 · 3530931
1 parent dada42e
commit 3530931
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 309e96cdf2f2c1a071102e8bdf828a3493e6e50a
+refs/heads/master: cfd28f6695d0fc047478480791a21bdd4967f98e
diff --git a/trunk/arch/um/kernel/time.c b/trunk/arch/um/kernel/time.c
@@ -75,15 +75,15 @@ static irqreturn_t um_timer(int irq, void *dev)
 
 static cycle_t itimer_read(void)
 {
-	return os_nsecs();
+	return os_nsecs() / 1000;
 }
 
 static struct clocksource itimer_clocksource = {
 	.name		= "itimer",
 	.rating		= 300,
 	.read		= itimer_read,
 	.mask		= CLOCKSOURCE_MASK(64),
-	.mult		= 1,
+	.mult		= 1000,
 	.shift		= 0,
 	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,
 };