summaryrefslogtreecommitdiff
path: root/arch/sparc64/lib/delay.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pretzel.yyz.us>2005-06-22 21:07:28 +0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-22 21:07:28 +0400
commitff40c6d3d1437ecdf295b8e39adcb06c3d6021ef (patch)
tree3666d029b4bd4df2909dbefd9c7a09e6042b7d32 /arch/sparc64/lib/delay.c
parent8bf62ecee58360749c5f0e68bc97d5e02a6816b1 (diff)
parent2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e (diff)
downloadlinux-ff40c6d3d1437ecdf295b8e39adcb06c3d6021ef.tar.xz
Merge upstream kernel changes into 'C/H/S support' branch of libata.
Diffstat (limited to 'arch/sparc64/lib/delay.c')
-rw-r--r--arch/sparc64/lib/delay.c2
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)
{
n *= 4;
- n *= (cpu_data(_smp_processor_id()).udelay_val * (HZ/4));
+ n *= (cpu_data(raw_smp_processor_id()).udelay_val * (HZ/4));
n >>= 32;
__delay(n + 1);