Commit 5e41763a authored by Giuliano Pochini's avatar Giuliano Pochini Committed by Paul Mackerras

[POWERPC] Fix breakage caused by 72486f1f

72486f1f 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: default avatarGiuliano Pochini <pochini@shiny.it>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 6590a019
...@@ -196,18 +196,22 @@ EXPORT_SYMBOL(nvram_sync); ...@@ -196,18 +196,22 @@ EXPORT_SYMBOL(nvram_sync);
#endif /* CONFIG_NVRAM */ #endif /* CONFIG_NVRAM */
static struct cpu cpu_devices[NR_CPUS]; static DEFINE_PER_CPU(struct cpu, cpu_devices);
int __init ppc_init(void) int __init ppc_init(void)
{ {
int i; int cpu;
/* clear the progress line */ /* clear the progress line */
if ( ppc_md.progress ) ppc_md.progress(" ", 0xffff); if (ppc_md.progress)
ppc_md.progress(" ", 0xffff);
/* register CPU devices */ /* register CPU devices */
for_each_possible_cpu(i) for_each_possible_cpu(cpu) {
register_cpu(&cpu_devices[i], i); struct cpu *c = &per_cpu(cpu_devices, cpu);
c->hotpluggable = 1;
register_cpu(c, cpu);
}
/* call platform init */ /* call platform init */
if (ppc_md.init != NULL) { if (ppc_md.init != NULL) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment