diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-02-22 22:41:41 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-03-08 23:03:24 -0500 |
commit | 1c56f838a9d0b25d68363bca133722c5330707b3 (patch) | |
tree | 1e12981383f56765c1ae87f35d0a8a694fb4b36f | |
parent | 44d7631bdb16211a492921dbc0d14fce66c20501 (diff) |
[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 80b482ca30df..79d0fa3a470d 100644 --- a/arch/powerpc/lib/locks.c +++ b/arch/powerpc/lib/locks.c | |||
@@ -43,9 +43,11 @@ void __spin_yield(raw_spinlock_t *lock) | |||
43 | if (firmware_has_feature(FW_FEATURE_ISERIES)) | 43 | if (firmware_has_feature(FW_FEATURE_ISERIES)) |
44 | HvCall2(HvCallBaseYieldProcessor, HvCall_YieldToProc, | 44 | HvCall2(HvCallBaseYieldProcessor, HvCall_YieldToProc, |
45 | ((u64)holder_cpu << 32) | yield_count); | 45 | ((u64)holder_cpu << 32) | yield_count); |
46 | #ifdef CONFIG_PPC_SPLPAR | ||
46 | else | 47 | else |
47 | plpar_hcall_norets(H_CONFER, | 48 | plpar_hcall_norets(H_CONFER, |
48 | get_hard_smp_processor_id(holder_cpu), yield_count); | 49 | get_hard_smp_processor_id(holder_cpu), yield_count); |
50 | #endif | ||
49 | } | 51 | } |
50 | 52 | ||
51 | /* | 53 | /* |
@@ -72,9 +74,11 @@ void __rw_yield(raw_rwlock_t *rw) | |||
72 | if (firmware_has_feature(FW_FEATURE_ISERIES)) | 74 | if (firmware_has_feature(FW_FEATURE_ISERIES)) |
73 | HvCall2(HvCallBaseYieldProcessor, HvCall_YieldToProc, | 75 | HvCall2(HvCallBaseYieldProcessor, HvCall_YieldToProc, |
74 | ((u64)holder_cpu << 32) | yield_count); | 76 | ((u64)holder_cpu << 32) | yield_count); |
77 | #ifdef CONFIG_PPC_SPLPAR | ||
75 | else | 78 | else |
76 | plpar_hcall_norets(H_CONFER, | 79 | plpar_hcall_norets(H_CONFER, |
77 | get_hard_smp_processor_id(holder_cpu), yield_count); | 80 | get_hard_smp_processor_id(holder_cpu), yield_count); |
81 | #endif | ||
78 | } | 82 | } |
79 | #endif | 83 | #endif |
80 | 84 | ||