diff --git a/arch/arm/kernel/psci_smp.c b/arch/arm/kernel/psci_smp.c
index a319a7877c60..71eb9a277e01 100644
--- a/arch/arm/kernel/psci_smp.c
+++ b/arch/arm/kernel/psci_smp.c
@@ -47,13 +47,19 @@
  *
  */
 
+#ifdef CONFIG_THUMB2_KERNEL
+#define secondary_start secondary_startup_arm
+extern void secondary_startup_arm(void);
+#else
+#define secondary_start secondary_startup
 extern void secondary_startup(void);
+#endif
 
 static int psci_boot_secondary(unsigned int cpu, struct task_struct *idle)
 {
 	if (psci_ops.cpu_on)
 		return psci_ops.cpu_on(cpu_logical_map(cpu),
-					virt_to_idmap(&secondary_startup));
+					virt_to_idmap(&secondary_start));
 	return -ENODEV;
 }
 
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index 5f4a81e7858f..f59472c44883 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -40,6 +40,15 @@
  * For such calls PSCI_FN_NATIVE(version, name) will choose the appropriate
  * (native-width) function ID.
  */
+
+#ifdef CONFIG_THUMB2_KERNEL
+#define cpu_resume_secondary cpu_resume_arm
+extern void cpu_resume_arm(void);
+#else
+#define cpu_resume_secondary cpu_resume
+extern void cpu_resume(void);
+#endif
+
 #ifdef CONFIG_64BIT
 #define PSCI_FN_NATIVE(version, name)	PSCI_##version##_FN64_##name
 #else
@@ -405,7 +414,7 @@ int psci_cpu_init_idle(unsigned int cpu)
 static int psci_suspend_finisher(unsigned long state_id)
 {
 	return psci_ops.cpu_suspend(state_id,
-				    __pa_symbol(cpu_resume));
+				    __pa_symbol(cpu_resume_secondary));
 }
 int psci_cpu_suspend_enter(unsigned long state_id)
 {
@@ -440,7 +449,7 @@ CPUIDLE_METHOD_OF_DECLARE(psci, "psci", &psci_cpuidle_ops);
 static int psci_system_suspend(unsigned long unused)
 {
 	return invoke_psci_fn(PSCI_FN_NATIVE(1_0, SYSTEM_SUSPEND),
-			      __pa_symbol(cpu_resume), 0, 0);
+			      __pa_symbol(cpu_resume_secondary), 0, 0);
 }
 
 static int psci_system_suspend_enter(suspend_state_t state)