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/sparc64/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/sparc64/lib/delay.c')
| -rw-r--r-- | arch/sparc64/lib/delay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/lib/delay.c b/arch/sparc64/lib/delay.c index f6b4c784d53e..e8808727617a 100644 --- a/arch/sparc64/lib/delay.c +++ b/arch/sparc64/lib/delay.c | |||
| @@ -31,7 +31,7 @@ void __const_udelay(unsigned long n) | |||
| 31 | { | 31 | { |
| 32 | n *= 4; | 32 | n *= 4; |
| 33 | 33 | ||
| 34 | n *= (cpu_data(_smp_processor_id()).udelay_val * (HZ/4)); | 34 | n *= (cpu_data(raw_smp_processor_id()).udelay_val * (HZ/4)); |
| 35 | n >>= 32; | 35 | n >>= 32; |
| 36 | 36 | ||
| 37 | __delay(n + 1); | 37 | __delay(n + 1); |