diff options
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/cell/smp.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/powernv/smp.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/smp.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/cell/smp.c b/arch/powerpc/platforms/cell/smp.c index d35dbbc8ec79..f75f6fcac729 100644 --- a/arch/powerpc/platforms/cell/smp.c +++ b/arch/powerpc/platforms/cell/smp.c | |||
@@ -142,7 +142,7 @@ static int smp_cell_cpu_bootable(unsigned int nr) | |||
142 | * during boot if the user requests it. Odd-numbered | 142 | * during boot if the user requests it. Odd-numbered |
143 | * cpus are assumed to be secondary threads. | 143 | * cpus are assumed to be secondary threads. |
144 | */ | 144 | */ |
145 | if (system_state < SYSTEM_RUNNING && | 145 | if (system_state == SYSTEM_BOOTING && |
146 | cpu_has_feature(CPU_FTR_SMT) && | 146 | cpu_has_feature(CPU_FTR_SMT) && |
147 | !smt_enabled_at_boot && cpu_thread_in_core(nr) != 0) | 147 | !smt_enabled_at_boot && cpu_thread_in_core(nr) != 0) |
148 | return 0; | 148 | return 0; |
diff --git a/arch/powerpc/platforms/powernv/smp.c b/arch/powerpc/platforms/powernv/smp.c index 88c9459c3e07..77784aead1c2 100644 --- a/arch/powerpc/platforms/powernv/smp.c +++ b/arch/powerpc/platforms/powernv/smp.c | |||
@@ -51,7 +51,7 @@ static int pnv_smp_cpu_bootable(unsigned int nr) | |||
51 | /* Special case - we inhibit secondary thread startup | 51 | /* Special case - we inhibit secondary thread startup |
52 | * during boot if the user requests it. | 52 | * during boot if the user requests it. |
53 | */ | 53 | */ |
54 | if (system_state < SYSTEM_RUNNING && cpu_has_feature(CPU_FTR_SMT)) { | 54 | if (system_state == SYSTEM_BOOTING && cpu_has_feature(CPU_FTR_SMT)) { |
55 | if (!smt_enabled_at_boot && cpu_thread_in_core(nr) != 0) | 55 | if (!smt_enabled_at_boot && cpu_thread_in_core(nr) != 0) |
56 | return 0; | 56 | return 0; |
57 | if (smt_enabled_at_boot | 57 | if (smt_enabled_at_boot |
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c index 12bc8c3663ad..306643cc9dbc 100644 --- a/arch/powerpc/platforms/pseries/smp.c +++ b/arch/powerpc/platforms/pseries/smp.c | |||
@@ -192,7 +192,7 @@ static int smp_pSeries_cpu_bootable(unsigned int nr) | |||
192 | /* Special case - we inhibit secondary thread startup | 192 | /* Special case - we inhibit secondary thread startup |
193 | * during boot if the user requests it. | 193 | * during boot if the user requests it. |
194 | */ | 194 | */ |
195 | if (system_state < SYSTEM_RUNNING && cpu_has_feature(CPU_FTR_SMT)) { | 195 | if (system_state == SYSTEM_BOOTING && cpu_has_feature(CPU_FTR_SMT)) { |
196 | if (!smt_enabled_at_boot && cpu_thread_in_core(nr) != 0) | 196 | if (!smt_enabled_at_boot && cpu_thread_in_core(nr) != 0) |
197 | return 0; | 197 | return 0; |
198 | if (smt_enabled_at_boot | 198 | if (smt_enabled_at_boot |