diff options
| author | James Bottomley <James.Bottomley@SteelEye.com> | 2006-02-24 13:04:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-24 14:31:38 -0800 |
| commit | 8d5c822b2920be9016806f61fd552d2301cfa2fc (patch) | |
| tree | f93da6d34191a26e3d9d38230da39e1ec2109989 | |
| parent | c314b6f1fa462acdb89323c75c597eeaae056e7c (diff) | |
| download | op-kernel-dev-8d5c822b2920be9016806f61fd552d2301cfa2fc.zip op-kernel-dev-8d5c822b2920be9016806f61fd552d2301cfa2fc.tar.gz | |
[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>
| -rw-r--r-- | arch/i386/mach-voyager/voyager_basic.c | 15 |
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 aa49a33..6761d29 100644 --- a/arch/i386/mach-voyager/voyager_basic.c +++ b/arch/i386/mach-voyager/voyager_basic.c @@ -23,6 +23,9 @@ #include <linux/delay.h> #include <linux/reboot.h> #include <linux/sysrq.h> +#include <linux/smp.h> +#include <linux/nodemask.h> +#include <asm/cpu.h> #include <asm/io.h> #include <asm/voyager.h> #include <asm/vic.h> @@ -329,3 +332,15 @@ void machine_power_off(void) 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); |
