2 files changed, 14 insertions, 2 deletions

diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index c8a2212014e0..6234c6978a1f 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -769,10 +769,13 @@ mcck_return:
 
         RESTORE_ALL __LC_RETURN_MCCK_PSW,0
 
-#ifdef CONFIG_SMP
 /*
  * Restart interruption handler, kick starter for additional CPUs
  */
+#ifdef CONFIG_SMP
+#ifndef CONFIG_HOTPLUG_CPU
+        .section .init.text,"ax"
+#endif
         .globl restart_int_handler
 restart_int_handler:
         l       %r15,__LC_SAVE_AREA+60  # load ksp
@@ -785,6 +788,9 @@ restart_int_handler:
         br      %r14                    # branch to start_secondary
 restart_addr:
         .long   start_secondary
+#ifndef CONFIG_HOTPLUG_CPU
+        .previous
+#endif
 #else
 /*
  * If we do not run with SMP enabled, let the new CPU crash ...
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index 93745fd8f555..685f11faa4bc 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -745,10 +745,13 @@ mcck_return:
 #endif
         lpswe   __LC_RETURN_MCCK_PSW    # back to caller
 
-#ifdef CONFIG_SMP
 /*
  * Restart interruption handler, kick starter for additional CPUs
  */
+#ifdef CONFIG_SMP
+#ifndef CONFIG_HOTPLUG_CPU
+        .section .init.text,"ax"
+#endif
         .globl restart_int_handler
 restart_int_handler:
         lg      %r15,__LC_SAVE_AREA+120 # load ksp
@@ -759,6 +762,9 @@ restart_int_handler:
         lmg     %r6,%r15,__SF_GPRS(%r15) # load registers from clone
         stosm   __SF_EMPTY(%r15),0x04   # now we can turn dat on
         jg      start_secondary
+#ifndef CONFIG_HOTPLUG_CPU
+        .previous
+#endif
 #else
 /*
  * If we do not run with SMP enabled, let the new CPU crash ...