diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-17 16:20:30 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-17 16:20:30 -0500 |
| commit | b04a92e1601eb6df3a3b6599e7fb7ee021eef2cb (patch) | |
| tree | f190980d5bffae81a67c0cea0d913ed2444ceb0c /arch/arm/kernel/setup.c | |
| parent | 70c07e02625ec46d0ffbfce1acef42d660803528 (diff) | |
| parent | f5e2a7b22e7d7dfda8794906d0fddeaaa09bb944 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/arm/kernel/setup.c')
| -rw-r--r-- | arch/arm/kernel/setup.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index c45d10d07bde..68273b4dc882 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -23,6 +23,7 @@ #include <linux/root_dev.h> #include <linux/cpu.h> #include <linux/interrupt.h> +#include <linux/smp.h> #include <asm/cpu.h> #include <asm/elf.h> @@ -771,6 +772,10 @@ void __init setup_arch(char **cmdline_p) paging_init(&meminfo, mdesc); request_standard_resources(&meminfo, mdesc); +#ifdef CONFIG_SMP + smp_init_cpus(); +#endif + cpu_init(); /* |