1 files changed, 16 insertions, 8 deletions

diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index a6d85c0a7f20..6ab16ac64d29 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -452,23 +452,27 @@ out:
  */
 int __cpuinit start_secondary(void *cpuvoid)
 {
-        /* Setup the cpu */
         cpu_init();
         preempt_disable();
-        /* Enable TOD clock interrupts on the secondary cpu. */
         init_cpu_timer();
-        /* Enable cpu timer interrupts on the secondary cpu. */
         init_cpu_vtimer();
-        /* Enable pfault pseudo page faults on this cpu. */
         pfault_init();
 
-        /* call cpu notifiers */
         notify_cpu_starting(smp_processor_id());
-        /* Mark this cpu as online */
         ipi_call_lock();
         set_cpu_online(smp_processor_id(), true);
         ipi_call_unlock();
-        /* Switch on interrupts */
+        __ctl_clear_bit(0, 28); /* Disable lowcore protection */
+        S390_lowcore.restart_psw.mask = PSW_BASE_BITS | PSW_DEFAULT_KEY;
+        S390_lowcore.restart_psw.addr =
+                PSW_ADDR_AMODE | (unsigned long) psw_restart_int_handler;
+        __ctl_set_bit(0, 28); /* Enable lowcore protection */
+        /*
+         * Wait until the cpu which brought this one up marked it
+         * active before enabling interrupts.
+         */
+        while (!cpumask_test_cpu(smp_processor_id(), cpu_active_mask))
+                cpu_relax();
         local_irq_enable();
         /* cpu_idle will call schedule for us */
         cpu_idle();
@@ -507,7 +511,11 @@ static int __cpuinit smp_alloc_lowcore(int cpu)
         memset((char *)lowcore + 512, 0, sizeof(*lowcore) - 512);
         lowcore->async_stack = async_stack + ASYNC_SIZE;
         lowcore->panic_stack = panic_stack + PAGE_SIZE;
-
+        lowcore->restart_psw.mask = PSW_BASE_BITS | PSW_DEFAULT_KEY;
+        lowcore->restart_psw.addr =
+                PSW_ADDR_AMODE | (unsigned long) restart_int_handler;
+        if (user_mode != HOME_SPACE_MODE)
+                lowcore->restart_psw.mask |= PSW_ASC_HOME;
 #ifndef CONFIG_64BIT
         if (MACHINE_HAS_IEEE) {
                 unsigned long save_area;