aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@SteelEye.com>2006-02-24 16:04:10 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-24 17:31:38 -0500
commit8d5c822b2920be9016806f61fd552d2301cfa2fc (patch)
treef93da6d34191a26e3d9d38230da39e1ec2109989 /arch
parentc314b6f1fa462acdb89323c75c597eeaae056e7c (diff)
[PATCH] voyager: fix boot panic by adding topology export
It looks like I can't get away without exporting topology functions from voyager any longer, so add them to the voyager subarchitecture. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/mach-voyager/voyager_basic.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/i386/mach-voyager/voyager_basic.c b/arch/i386/mach-voyager/voyager_basic.c
index aa49a33a572c..6761d294f260 100644
--- a/arch/i386/mach-voyager/voyager_basic.c
+++ b/arch/i386/mach-voyager/voyager_basic.c
@@ -23,6 +23,9 @@
23#include <linux/delay.h> 23#include <linux/delay.h>
24#include <linux/reboot.h> 24#include <linux/reboot.h>
25#include <linux/sysrq.h> 25#include <linux/sysrq.h>
26#include <linux/smp.h>
27#include <linux/nodemask.h>
28#include <asm/cpu.h>
26#include <asm/io.h> 29#include <asm/io.h>
27#include <asm/voyager.h> 30#include <asm/voyager.h>
28#include <asm/vic.h> 31#include <asm/vic.h>
@@ -329,3 +332,15 @@ void machine_power_off(void)
329 pm_power_off(); 332 pm_power_off();
330} 333}
331 334
335static struct i386_cpu cpu_devices[NR_CPUS];
336
337static int __init topology_init(void)
338{
339 int i;
340
341 for_each_present_cpu(i)
342 register_cpu(&cpu_devices[i].cpu, i, NULL);
343 return 0;
344}
345
346subsys_initcall(topology_init);