diff options
Diffstat (limited to 'arch/sh/kernel/setup.c')
-rw-r--r-- | arch/sh/kernel/setup.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 2cf7dec0d690..b3027a6775b9 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
23 | #include <linux/kexec.h> | 23 | #include <linux/kexec.h> |
24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
25 | #include <linux/smp.h> | ||
25 | #include <asm/uaccess.h> | 26 | #include <asm/uaccess.h> |
26 | #include <asm/io.h> | 27 | #include <asm/io.h> |
27 | #include <asm/page.h> | 28 | #include <asm/page.h> |
@@ -42,7 +43,13 @@ extern void * __rd_start, * __rd_end; | |||
42 | * This value will be used at the very early stage of serial setup. | 43 | * This value will be used at the very early stage of serial setup. |
43 | * The bigger value means no problem. | 44 | * The bigger value means no problem. |
44 | */ | 45 | */ |
45 | struct sh_cpuinfo boot_cpu_data = { CPU_SH_NONE, 10000000, }; | 46 | struct sh_cpuinfo cpu_data[NR_CPUS] __read_mostly = { |
47 | [0] = { | ||
48 | .type = CPU_SH_NONE, | ||
49 | .loops_per_jiffy = 10000000, | ||
50 | }, | ||
51 | }; | ||
52 | EXPORT_SYMBOL(cpu_data); | ||
46 | 53 | ||
47 | /* | 54 | /* |
48 | * The machine vector. First entry in .machvec.init, or clobbered by | 55 | * The machine vector. First entry in .machvec.init, or clobbered by |
@@ -272,6 +279,10 @@ void __init setup_arch(char **cmdline_p) | |||
272 | sh_mv.mv_setup(cmdline_p); | 279 | sh_mv.mv_setup(cmdline_p); |
273 | 280 | ||
274 | paging_init(); | 281 | paging_init(); |
282 | |||
283 | #ifdef CONFIG_SMP | ||
284 | plat_smp_setup(); | ||
285 | #endif | ||
275 | } | 286 | } |
276 | 287 | ||
277 | static const char *cpu_name[] = { | 288 | static const char *cpu_name[] = { |
@@ -279,7 +290,7 @@ static const char *cpu_name[] = { | |||
279 | [CPU_SH7705] = "SH7705", [CPU_SH7706] = "SH7706", | 290 | [CPU_SH7705] = "SH7705", [CPU_SH7706] = "SH7706", |
280 | [CPU_SH7707] = "SH7707", [CPU_SH7708] = "SH7708", | 291 | [CPU_SH7707] = "SH7707", [CPU_SH7708] = "SH7708", |
281 | [CPU_SH7709] = "SH7709", [CPU_SH7710] = "SH7710", | 292 | [CPU_SH7709] = "SH7709", [CPU_SH7710] = "SH7710", |
282 | [CPU_SH7712] = "SH7712", | 293 | [CPU_SH7712] = "SH7712", [CPU_SH7720] = "SH7720", |
283 | [CPU_SH7729] = "SH7729", [CPU_SH7750] = "SH7750", | 294 | [CPU_SH7729] = "SH7729", [CPU_SH7750] = "SH7750", |
284 | [CPU_SH7750S] = "SH7750S", [CPU_SH7750R] = "SH7750R", | 295 | [CPU_SH7750S] = "SH7750S", [CPU_SH7750R] = "SH7750R", |
285 | [CPU_SH7751] = "SH7751", [CPU_SH7751R] = "SH7751R", | 296 | [CPU_SH7751] = "SH7751", [CPU_SH7751R] = "SH7751R", |