---

yaml --- r: 163532 b: refs/heads/master c: bd4fb4d h: refs/heads/master v: v3
git-mirror · Aug 24, 2009 · 6fe22ad · 6fe22ad
1 parent ccc88b5
commit 6fe22ad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d243dd37002bcee54841852ab1b8606fd457851
+refs/heads/master: bd4fb4d4c1e4a5a2ffbf57a83817a749df1339dd
diff --git a/trunk/arch/sh/lib/delay.c b/trunk/arch/sh/lib/delay.c
@@ -21,13 +21,14 @@ void __delay(unsigned long loops)
 
 inline void __const_udelay(unsigned long xloops)
 {
+	xloops *= 4;
 	__asm__("dmulu.l	%0, %2\n\t"
 		"sts	mach, %0"
 		: "=r" (xloops)
 		: "0" (xloops),
-		  "r" (HZ * cpu_data[raw_smp_processor_id()].loops_per_jiffy)
+		  "r" (cpu_data[raw_smp_processor_id()].loops_per_jiffy * (HZ/4))
 		: "macl", "mach");
-	__delay(xloops);
+	__delay(++xloops);
 }
 
 void __udelay(unsigned long usecs)