aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/kernel/setup.c')
-rw-r--r--arch/arm/kernel/setup.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index c45d10d07bde..08974cbe9824 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -23,6 +23,7 @@
23#include <linux/root_dev.h> 23#include <linux/root_dev.h>
24#include <linux/cpu.h> 24#include <linux/cpu.h>
25#include <linux/interrupt.h> 25#include <linux/interrupt.h>
26#include <linux/smp.h>
26 27
27#include <asm/cpu.h> 28#include <asm/cpu.h>
28#include <asm/elf.h> 29#include <asm/elf.h>
@@ -36,6 +37,8 @@
36#include <asm/mach/irq.h> 37#include <asm/mach/irq.h>
37#include <asm/mach/time.h> 38#include <asm/mach/time.h>
38 39
40#include "compat.h"
41
39#ifndef MEM_SIZE 42#ifndef MEM_SIZE
40#define MEM_SIZE (16*1024*1024) 43#define MEM_SIZE (16*1024*1024)
41#endif 44#endif
@@ -52,10 +55,7 @@ static int __init fpe_setup(char *line)
52__setup("fpe=", fpe_setup); 55__setup("fpe=", fpe_setup);
53#endif 56#endif
54 57
55extern unsigned int mem_fclk_21285;
56extern void paging_init(struct meminfo *, struct machine_desc *desc); 58extern void paging_init(struct meminfo *, struct machine_desc *desc);
57extern void convert_to_tag_list(struct tag *tags);
58extern void squash_mem_tags(struct tag *tag);
59extern void reboot_setup(char *str); 59extern void reboot_setup(char *str);
60extern int root_mountflags; 60extern int root_mountflags;
61extern void _stext, _text, _etext, __data_start, _edata, _end; 61extern void _stext, _text, _etext, __data_start, _edata, _end;
@@ -771,6 +771,10 @@ void __init setup_arch(char **cmdline_p)
771 paging_init(&meminfo, mdesc); 771 paging_init(&meminfo, mdesc);
772 request_standard_resources(&meminfo, mdesc); 772 request_standard_resources(&meminfo, mdesc);
773 773
774#ifdef CONFIG_SMP
775 smp_init_cpus();
776#endif
777
774 cpu_init(); 778 cpu_init();
775 779
776 /* 780 /*