diff --git a/[refs] b/[refs]
index 670cfc3b4624..acc54635273d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9715b8c7d55912fb6f5dd9b1c084d8eefcd0d848
+refs/heads/master: 1cfa1e8f2c824b131612c9a70b48433998237331
diff --git a/trunk/arch/sh/kernel/smp.c b/trunk/arch/sh/kernel/smp.c
index 4d27597c5da8..3711a76a18e0 100644
--- a/trunk/arch/sh/kernel/smp.c
+++ b/trunk/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();