- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix.

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

diff --git a/arch/powerpc/lib/locks.c b/arch/powerpc/lib/locks.c
index 80b482c..79d0fa3 100644 (file)
--- a/arch/powerpc/lib/locks.c
+++ b/arch/powerpc/lib/locks.c
@@ -43,9 +43,11 @@ void __spin_yield(raw_spinlock_t *lock)
        if (firmware_has_feature(FW_FEATURE_ISERIES))
                HvCall2(HvCallBaseYieldProcessor, HvCall_YieldToProc,
                        ((u64)holder_cpu << 32) | yield_count);
+#ifdef CONFIG_PPC_SPLPAR
        else
                plpar_hcall_norets(H_CONFER,
                        get_hard_smp_processor_id(holder_cpu), yield_count);
+#endif
 }
 
 /*
@@ -72,9 +74,11 @@ void __rw_yield(raw_rwlock_t *rw)
        if (firmware_has_feature(FW_FEATURE_ISERIES))
                HvCall2(HvCallBaseYieldProcessor, HvCall_YieldToProc,
                        ((u64)holder_cpu << 32) | yield_count);
+#ifdef CONFIG_PPC_SPLPAR
        else
                plpar_hcall_norets(H_CONFER,
                        get_hard_smp_processor_id(holder_cpu), yield_count);
+#endif
 }
 #endif