summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-04-26 11:55:01 +0200
committerPaul Mundt <lethal@linux-sh.org>2010-04-26 11:55:01 +0200
commit1cfa1e8f2c824b131612c9a70b48433998237331 (patch)
treeff86337fbc951f5faf0c83d5b46ef963ab4b265c /arch/sh/kernel
parentsh: provide percpu CPU states for hotplug notifiers. (diff)
downloadlinux-1cfa1e8f2c824b131612c9a70b48433998237331.tar.xz
linux-1cfa1e8f2c824b131612c9a70b48433998237331.zip
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')
-rw-r--r--arch/sh/kernel/smp.c4
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)
mp_ops = ops;
}
-static inline void __init smp_store_cpu_info(unsigned int cpu)
+static inline void __cpuinit smp_store_cpu_info(unsigned int cpu)
{
struct sh_cpuinfo *c = cpu_data + cpu;
@@ -66,7 +66,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
#endif
}
-void __devinit smp_prepare_boot_cpu(void)
+void __init smp_prepare_boot_cpu(void)
{
unsigned int cpu = smp_processor_id();