From 3b4de37e6d230ca425b46bb48425dc029f9332de Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Tue, 7 Aug 2012 17:59:54 +0100
Subject: [PATCH] --- yaml --- r: 334187 b: refs/heads/master c:
 807607f79b9d0ed81561746e4e1121905e75cf0f h: refs/heads/master i:   334185:
 c2ee30c66f3535517b191af927f34dcd1a6882bc   334183:
 50299f5a2763d52af3636351a89effb60ca9c0bb v: v3

---
 [refs]                          | 2 +-
 trunk/arch/openrisc/lib/delay.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 177376a01eac..a95423b95200 100644
--- 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
index 0c12407d3d5c..c330767c9217 100644
--- 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);