mirror of https://gitee.com/openkylin/linux.git
[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>
This commit is contained in:
parent
44d7631bdb
commit
1c56f838a9
|
@ -43,9 +43,11 @@ void __spin_yield(raw_spinlock_t *lock)
|
||||||
if (firmware_has_feature(FW_FEATURE_ISERIES))
|
if (firmware_has_feature(FW_FEATURE_ISERIES))
|
||||||
HvCall2(HvCallBaseYieldProcessor, HvCall_YieldToProc,
|
HvCall2(HvCallBaseYieldProcessor, HvCall_YieldToProc,
|
||||||
((u64)holder_cpu << 32) | yield_count);
|
((u64)holder_cpu << 32) | yield_count);
|
||||||
|
#ifdef CONFIG_PPC_SPLPAR
|
||||||
else
|
else
|
||||||
plpar_hcall_norets(H_CONFER,
|
plpar_hcall_norets(H_CONFER,
|
||||||
get_hard_smp_processor_id(holder_cpu), yield_count);
|
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))
|
if (firmware_has_feature(FW_FEATURE_ISERIES))
|
||||||
HvCall2(HvCallBaseYieldProcessor, HvCall_YieldToProc,
|
HvCall2(HvCallBaseYieldProcessor, HvCall_YieldToProc,
|
||||||
((u64)holder_cpu << 32) | yield_count);
|
((u64)holder_cpu << 32) | yield_count);
|
||||||
|
#ifdef CONFIG_PPC_SPLPAR
|
||||||
else
|
else
|
||||||
plpar_hcall_norets(H_CONFER,
|
plpar_hcall_norets(H_CONFER,
|
||||||
get_hard_smp_processor_id(holder_cpu), yield_count);
|
get_hard_smp_processor_id(holder_cpu), yield_count);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue