1 files changed, 21 insertions, 0 deletions

diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c
index c49a833bf9b..993381257f6 100644
--- a/arch/arm/mach-shmobile/platsmp.c
+++ b/arch/arm/mach-shmobile/platsmp.c
@@ -22,12 +22,16 @@
 #include <mach/common.h>
 
 #define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2())
+#define is_r8a7779() machine_is_marzen()
 
 static unsigned int __init shmobile_smp_get_core_count(void)
 {
         if (is_sh73a0())
                 return sh73a0_get_core_count();
 
+        if (is_r8a7779())
+                return r8a7779_get_core_count();
+
         return 1;
 }
 
@@ -35,6 +39,17 @@ static void __init shmobile_smp_prepare_cpus(void)
 {
         if (is_sh73a0())
                 sh73a0_smp_prepare_cpus();
+
+        if (is_r8a7779())
+                r8a7779_smp_prepare_cpus();
+}
+
+int shmobile_platform_cpu_kill(unsigned int cpu)
+{
+        if (is_r8a7779())
+                return r8a7779_platform_cpu_kill(cpu);
+
+        return 1;
 }
 
 void __cpuinit platform_secondary_init(unsigned int cpu)
@@ -43,6 +58,9 @@ void __cpuinit platform_secondary_init(unsigned int cpu)
 
         if (is_sh73a0())
                 sh73a0_secondary_init(cpu);
+
+        if (is_r8a7779())
+                r8a7779_secondary_init(cpu);
 }
 
 int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
@@ -50,6 +68,9 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
         if (is_sh73a0())
                 return sh73a0_boot_secondary(cpu);
 
+        if (is_r8a7779())
+                return r8a7779_boot_secondary(cpu);
+
         return -ENOSYS;
 }