diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-06-22 21:26:47 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-06-22 21:26:47 -0400 |
| commit | ea0daab4ae4a2f853f06c76961c0ed324fd0804c (patch) | |
| tree | f6fbe2db5772695181b7a7257b05e43343bd8d75 /arch/sh/lib/delay.c | |
| parent | 58aab753de605c14b9878a897e7349c3063afeff (diff) | |
| parent | 1bdf7a78c2b21fb94dfe7994dbe89310b18479d2 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
Diffstat (limited to 'arch/sh/lib/delay.c')
| -rw-r--r-- | arch/sh/lib/delay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/lib/delay.c b/arch/sh/lib/delay.c index 50b36037d86b..351714694d6d 100644 --- a/arch/sh/lib/delay.c +++ b/arch/sh/lib/delay.c | |||
| @@ -24,7 +24,7 @@ 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[_smp_processor_id()].loops_per_jiffy) | 27 | : "0" (xloops), "r" (cpu_data[raw_smp_processor_id()].loops_per_jiffy) |
| 28 | : "macl", "mach"); | 28 | : "macl", "mach"); |
| 29 | __delay(xloops * HZ); | 29 | __delay(xloops * HZ); |
| 30 | } | 30 | } |