diff options
| author | Anton Blanchard <anton@samba.org> | 2005-06-20 21:43:15 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-06-20 21:43:15 +1000 |
| commit | 0231c290d817513d448963520a97eadd51a370b7 (patch) | |
| tree | acb1fa2c9e7484d43905d460328d58268ef3b267 | |
| parent | ad21798e0ecc3b54720a2420b341f51dfb254706 (diff) | |
| download | kernel_samsung_tuna-0231c290d817513d448963520a97eadd51a370b7.zip kernel_samsung_tuna-0231c290d817513d448963520a97eadd51a370b7.tar.gz kernel_samsung_tuna-0231c290d817513d448963520a97eadd51a370b7.tar.bz2 | |
[PATCH] ppc64: use cpu_has_feature macro
Use the new cpu_has_feature macros instead of open coding it.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/ppc64/kernel/pSeries_smp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/ppc64/kernel/pSeries_smp.c b/arch/ppc64/kernel/pSeries_smp.c index fbad349..4203bd0 100644 --- a/arch/ppc64/kernel/pSeries_smp.c +++ b/arch/ppc64/kernel/pSeries_smp.c @@ -375,7 +375,7 @@ static int smp_pSeries_cpu_bootable(unsigned int nr) * cpus are assumed to be secondary threads. */ if (system_state < SYSTEM_RUNNING && - cur_cpu_spec->cpu_features & CPU_FTR_SMT && + cpu_has_feature(CPU_FTR_SMT) && !smt_enabled_at_boot && nr % 2 != 0) return 0; @@ -419,8 +419,8 @@ void __init smp_init_pSeries(void) #endif /* Mark threads which are still spinning in hold loops. */ - if (cur_cpu_spec->cpu_features & CPU_FTR_SMT) - for_each_present_cpu(i) { + if (cpu_has_feature(CPU_FTR_SMT)) { + for_each_present_cpu(i) { if (i % 2 == 0) /* * Even-numbered logical cpus correspond to @@ -428,8 +428,9 @@ void __init smp_init_pSeries(void) */ cpu_set(i, of_spin_map); } - else + } else { of_spin_map = cpu_present_map; + } cpu_clear(boot_cpuid, of_spin_map); |