tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

[PATCH] fix voyager after topology.c move

Commit 9c869edac591977314323a4eaad5f7633fca684f broke voyager again
rather subtly because it already had its own topology exporting
functions, so now each CPU gets registered twice.

I think we can actually use the generic ones, so I don't propose
reverting it. The attached should eliminate the voyager topology
functions in favour of the generic ones.

I also added a define to ensure voyager is never hotplug CPU (we don't
have the support in the SMP harness).

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

James Bottomley and committed by
Linus Torvalds e18f9b4b d5176123

+1 -15
+1 -1
arch/i386/Kconfig
··· 733 733 734 734 config HOTPLUG_CPU 735 735 bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" 736 - depends on SMP && HOTPLUG && EXPERIMENTAL 736 + depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER 737 737 ---help--- 738 738 Say Y here to experiment with turning CPUs off and on. CPUs 739 739 can be controlled through /sys/devices/system/cpu.
-14
arch/i386/mach-voyager/voyager_basic.c
··· 25 25 #include <linux/sysrq.h> 26 26 #include <linux/smp.h> 27 27 #include <linux/nodemask.h> 28 - #include <asm/cpu.h> 29 28 #include <asm/io.h> 30 29 #include <asm/voyager.h> 31 30 #include <asm/vic.h> ··· 330 331 if (pm_power_off) 331 332 pm_power_off(); 332 333 } 333 - 334 - static struct i386_cpu cpu_devices[NR_CPUS]; 335 - 336 - static int __init topology_init(void) 337 - { 338 - int i; 339 - 340 - for_each_present_cpu(i) 341 - register_cpu(&cpu_devices[i].cpu, i, NULL); 342 - return 0; 343 - } 344 - 345 - subsys_initcall(topology_init);