aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2007-03-13 05:54:21 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-03-13 05:54:21 -0400
commit66fb8bd209926140844830762164a44afdbf44ef (patch)
treec6ab532e2c523b19a4e18a995f0d33c94512e834 /arch/arm/kernel
parent8b9909ded6922c33c221b105b26917780cfa497d (diff)
[ARM] 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 ARM for this brain damage. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/setup.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 03e37af315d7..0453dcc757b4 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -839,8 +839,11 @@ static int __init topology_init(void)
839{ 839{
840 int cpu; 840 int cpu;
841 841
842 for_each_possible_cpu(cpu) 842 for_each_possible_cpu(cpu) {
843 register_cpu(&per_cpu(cpu_data, cpu).cpu, cpu); 843 struct cpuinfo_arm *cpuinfo = &per_cpu(cpu_data, cpu);
844 cpuinfo->cpu.hotpluggable = 1;
845 register_cpu(&cpuinfo->cpu, cpu);
846 }
844 847
845 return 0; 848 return 0;
846} 849}