diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
| commit | 2ecf042ef530dd0943e41d84b6344f507941af3e (patch) | |
| tree | 73100361dd74e3f80f14c7c81ba4675948983f44 /arch/sh/lib/delay.c | |
| parent | 32a56ebb24f23da1bbaf24292acf85b6c04526ab (diff) | |
| parent | de5603748af8bf7deac403e6ba92887f8d18e812 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/sh/lib/delay.c')
| -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 351714694d6d..f3ddd2133e6f 100644 --- a/arch/sh/lib/delay.c +++ b/arch/sh/lib/delay.c | |||
| @@ -24,9 +24,10 @@ inline void __const_udelay(unsigned long xloops) | |||
| 24 | __asm__("dmulu.l %0, %2\n\t" | 24 | __asm__("dmulu.l %0, %2\n\t" |
| 25 | "sts mach, %0" | 25 | "sts mach, %0" |
| 26 | : "=r" (xloops) | 26 | : "=r" (xloops) |
| 27 | : "0" (xloops), "r" (cpu_data[raw_smp_processor_id()].loops_per_jiffy) | 27 | : "0" (xloops), |
| 28 | "r" (HZ * cpu_data[raw_smp_processor_id()].loops_per_jiffy) | ||
| 28 | : "macl", "mach"); | 29 | : "macl", "mach"); |
| 29 | __delay(xloops * HZ); | 30 | __delay(xloops); |
| 30 | } | 31 | } |
| 31 | 32 | ||
| 32 | void __udelay(unsigned long usecs) | 33 | void __udelay(unsigned long usecs) |