---

yaml --- r: 334187 b: refs/heads/master c: 807607f h: refs/heads/master i: 334185: c2ee30c 334183: 50299f5 v: v3
git-mirror · Sep 1, 2012 · 3b4de37 · 3b4de37
1 parent 6507a8b
commit 3b4de37
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: 439164663e5d1753360ff84ea4d5c598459e5d50
+refs/heads/master: 807607f79b9d0ed81561746e4e1121905e75cf0f
diff --git a/trunk/arch/openrisc/lib/delay.c b/trunk/arch/openrisc/lib/delay.c
@@ -30,9 +30,9 @@ int __devinit read_current_timer(unsigned long *timer_value)
 
 void __delay(unsigned long cycles)
 {
-	cycles_t target = get_cycles() + cycles;
+	cycles_t start = get_cycles();
 
-	while (get_cycles() < target)
+	while ((get_cycles() - start) < cycles)
 		cpu_relax();
 }
 EXPORT_SYMBOL(__delay);