diff options
| author | Stuart Menefy <stuart.menefy@st.com> | 2009-08-24 18:18:50 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-24 18:18:50 +0900 |
| commit | bd4fb4d4c1e4a5a2ffbf57a83817a749df1339dd (patch) | |
| tree | 994804b9290aeaea3113842e486c22fbec30cdc1 | |
| parent | 6d243dd37002bcee54841852ab1b8606fd457851 (diff) | |
| download | op-kernel-dev-bd4fb4d4c1e4a5a2ffbf57a83817a749df1339dd.zip op-kernel-dev-bd4fb4d4c1e4a5a2ffbf57a83817a749df1339dd.tar.gz | |
sh: Fix underflow in SH udelay() code.
Signed-off-by: Stuart Menefy <stuart.menefy@st.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | arch/sh/lib/delay.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sh/lib/delay.c b/arch/sh/lib/delay.c index f3ddd21..faa8f86 100644 --- a/arch/sh/lib/delay.c +++ b/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) |
