Skip to content

Commit

Permalink
[PATCH] ppc64: use cpu_has_feature macro
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Anton Blanchard authored and Paul Mackerras committed Jun 20, 2005
1 parent ad21798 commit 0231c29
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions arch/ppc64/kernel/pSeries_smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -419,17 +419,18 @@ 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
* primary threads.
*/
cpu_set(i, of_spin_map);
}
else
} else {
of_spin_map = cpu_present_map;
}

cpu_clear(boot_cpuid, of_spin_map);

Expand Down

0 comments on commit 0231c29

Please sign in to comment.