update to 2.6.9-rc1

[linux-flexiantxendom0-3.2.10.git] / arch / ppc64 / lib / locks.c

diff --git a/arch/ppc64/lib/locks.c b/arch/ppc64/lib/locks.c
index 58e973c..703118d 100644 (file)
--- a/arch/ppc64/lib/locks.c
+++ b/arch/ppc64/lib/locks.c
@@ -63,7 +63,8 @@ void __spin_yield(spinlock_t *lock)
        HvCall2(HvCallBaseYieldProcessor, HvCall_YieldToProc,
                ((u64)holder_cpu << 32) | yield_count);
 #else
-       plpar_hcall_norets(H_CONFER, holder_cpu, yield_count);
+       plpar_hcall_norets(H_CONFER, get_hard_smp_processor_id(holder_cpu),
+                          yield_count);
 #endif
 }
 
@@ -179,7 +180,8 @@ void __rw_yield(rwlock_t *rw)
        HvCall2(HvCallBaseYieldProcessor, HvCall_YieldToProc,
                ((u64)holder_cpu << 32) | yield_count);
 #else
-       plpar_hcall_norets(H_CONFER, holder_cpu, yield_count);
+       plpar_hcall_norets(H_CONFER, get_hard_smp_processor_id(holder_cpu),
+                          yield_count);
 #endif
 }