Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1c56f838a9d0b25d68363bca133722c5330707b3
Commit:     1c56f838a9d0b25d68363bca133722c5330707b3
Parent:     44d7631bdb16211a492921dbc0d14fce66c20501
Author:     Stephen Rothwell <[EMAIL PROTECTED]>
AuthorDate: Fri Feb 23 14:41:41 2007 +1100
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Fri Mar 9 15:03:24 2007 +1100

    [POWERPC] Make ppc64_defconfig without CONFIG_PPC_PSERIES build
    
    Signed-off-by: Stephen Rothwell <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/powerpc/lib/locks.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/lib/locks.c b/arch/powerpc/lib/locks.c
index 80b482c..79d0fa3 100644
--- 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
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to