From 6fe22ad52a7f04975cb66742ec4d4cc2b2afcfe9 Mon Sep 17 00:00:00 2001 From: Stuart Menefy Date: Mon, 24 Aug 2009 18:18:50 +0900 Subject: [PATCH] --- yaml --- r: 163532 b: refs/heads/master c: bd4fb4d4c1e4a5a2ffbf57a83817a749df1339dd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sh/lib/delay.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 722816348179..2dec77dbdff5 100644 --- 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 index f3ddd2133e6f..faa8f86c0db4 100644 --- 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)