diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-23 06:26:22 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-23 06:26:22 -0400 |
| commit | 3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 (patch) | |
| tree | ceba46966a5a1112a05d257d8ecb25ae5eee95e0 /arch/sh/lib/delay.c | |
| parent | 364f6c717deef4a3ac4982e670fa9846b43cd060 (diff) | |
| parent | ee98689be1b054897ff17655008c3048fe88be94 (diff) | |
Automatic merge with /usr/src/ntfs-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 | } |