diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-02-23 14:41:41 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-03-09 15:03:24 +1100 |
| commit | 1c56f838a9d0b25d68363bca133722c5330707b3 (patch) | |
| tree | 1e12981383f56765c1ae87f35d0a8a694fb4b36f | |
| parent | 44d7631bdb16211a492921dbc0d14fce66c20501 (diff) | |
| download | op-kernel-dev-1c56f838a9d0b25d68363bca133722c5330707b3.zip op-kernel-dev-1c56f838a9d0b25d68363bca133722c5330707b3.tar.gz | |
[POWERPC] Make ppc64_defconfig without CONFIG_PPC_PSERIES build
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | 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 |
