iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] fix voyager after topology.c move

Browse Source 
Commit 9c869edac5 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>
This commit is contained in:
James Bottomley 2006-02-26 17:07:45 -06:00 committed by Linus Torvalds
parent d51761233d
commit e18f9b4be4
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/i386/Kconfig
View File

@ -733,7 +733,7 @@ config PHYSICAL_START
config HOTPLUG_CPU config HOTPLUG_CPU
bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
depends on SMP && HOTPLUG && EXPERIMENTAL depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER
---help--- ---help---
Say Y here to experiment with turning CPUs off and on. CPUs Say Y here to experiment with turning CPUs off and on. CPUs
can be controlled through /sys/devices/system/cpu. can be controlled through /sys/devices/system/cpu.

14
arch/i386/mach-voyager/voyager_basic.c
View File

@ -25,7 +25,6 @@
#include <linux/sysrq.h> #include <linux/sysrq.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/nodemask.h> #include <linux/nodemask.h>
#include <asm/cpu.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/voyager.h> #include <asm/voyager.h>
#include <asm/vic.h> #include <asm/vic.h>
@ -331,16 +330,3 @@ void machine_power_off(void)
if (pm_power_off) if (pm_power_off)
pm_power_off(); pm_power_off();
} }
static struct i386_cpu cpu_devices[NR_CPUS];
static int __init topology_init(void)
{
int i;
for_each_present_cpu(i)
register_cpu(&cpu_devices[i].cpu, i, NULL);
return 0;
}
subsys_initcall(topology_init);