aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiuliano Pochini <pochini@shiny.it>2007-03-27 01:40:28 -0400
committerPaul Mackerras <paulus@samba.org>2007-04-12 13:55:16 -0400
commit5e41763ae9b4b6335fab88da85600f16d7a5a7b5 (patch)
treec624b71411c709b53cd7c5773924f282e636c645
parent6590a0197cc89e663d884503073dbe235b3bd860 (diff)
[POWERPC] Fix breakage caused by 72486f1f8f0a2bc828b9d30cf4690cf2dd6807fc
72486f1f8f0a2bc828b9d30cf4690cf2dd6807fc inverted the sense for enabling hotplug CPU controls without reference to any other architecture other than i386, ia64 and PowerPC. This left everyone else without hotplug CPU control. Fix powerpc for this brain damage. (akpm: patch adapted from rmk's ARM fix. Changelog stolen from rmk) Signed-off-by: Giuliano Pochini <pochini@shiny.it> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/kernel/setup_32.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index f688548f74cd..35f8f443c14f 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -196,18 +196,22 @@ EXPORT_SYMBOL(nvram_sync);
196 196
197#endif /* CONFIG_NVRAM */ 197#endif /* CONFIG_NVRAM */
198 198
199static struct cpu cpu_devices[NR_CPUS]; 199static DEFINE_PER_CPU(struct cpu, cpu_devices);
200 200
201int __init ppc_init(void) 201int __init ppc_init(void)
202{ 202{
203 int i; 203 int cpu;
204 204
205 /* clear the progress line */ 205 /* clear the progress line */
206 if ( ppc_md.progress ) ppc_md.progress(" ", 0xffff); 206 if (ppc_md.progress)
207 ppc_md.progress(" ", 0xffff);
207 208
208 /* register CPU devices */ 209 /* register CPU devices */
209 for_each_possible_cpu(i) 210 for_each_possible_cpu(cpu) {
210 register_cpu(&cpu_devices[i], i); 211 struct cpu *c = &per_cpu(cpu_devices, cpu);
212 c->hotpluggable = 1;
213 register_cpu(c, cpu);
214 }
211 215
212 /* call platform init */ 216 /* call platform init */
213 if (ppc_md.init != NULL) { 217 if (ppc_md.init != NULL) {