diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 05:55:01 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 05:55:01 -0400 |
commit | 1cfa1e8f2c824b131612c9a70b48433998237331 (patch) | |
tree | ff86337fbc951f5faf0c83d5b46ef963ab4b265c /arch/sh/kernel/smp.c | |
parent | 9715b8c7d55912fb6f5dd9b1c084d8eefcd0d848 (diff) |
sh: flag smp_store_cpu_info() __cpuinit.
smp_store_cpu_info() is presently flagged as __init, but is called by
start_secondary() which is __cpuinit, fix it up.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/smp.c')
-rw-r--r-- | arch/sh/kernel/smp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c index 4d27597c5da8..3711a76a18e0 100644 --- a/arch/sh/kernel/smp.c +++ b/arch/sh/kernel/smp.c | |||
@@ -44,7 +44,7 @@ void __cpuinit register_smp_ops(struct plat_smp_ops *ops) | |||
44 | mp_ops = ops; | 44 | mp_ops = ops; |
45 | } | 45 | } |
46 | 46 | ||
47 | static inline void __init smp_store_cpu_info(unsigned int cpu) | 47 | static inline void __cpuinit smp_store_cpu_info(unsigned int cpu) |
48 | { | 48 | { |
49 | struct sh_cpuinfo *c = cpu_data + cpu; | 49 | struct sh_cpuinfo *c = cpu_data + cpu; |
50 | 50 | ||
@@ -66,7 +66,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) | |||
66 | #endif | 66 | #endif |
67 | } | 67 | } |
68 | 68 | ||
69 | void __devinit smp_prepare_boot_cpu(void) | 69 | void __init smp_prepare_boot_cpu(void) |
70 | { | 70 | { |
71 | unsigned int cpu = smp_processor_id(); | 71 | unsigned int cpu = smp_processor_id(); |
72 | 72 | ||