1 files changed, 24 insertions, 1 deletions

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 0c35dee10b0..7b371c37061 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -346,7 +346,7 @@ setup_lowcore(void)
         lc = __alloc_bootmem_low(LC_PAGES * PAGE_SIZE, LC_PAGES * PAGE_SIZE, 0);
         lc->restart_psw.mask = PSW_BASE_BITS | PSW_DEFAULT_KEY;
         lc->restart_psw.addr =
-                PSW_ADDR_AMODE | (unsigned long) restart_int_handler;
+                PSW_ADDR_AMODE | (unsigned long) psw_restart_int_handler;
         if (user_mode != HOME_SPACE_MODE)
                 lc->restart_psw.mask |= PSW_ASC_HOME;
         lc->external_new_psw.mask = psw_kernel_bits;
@@ -529,6 +529,27 @@ static void __init setup_memory_end(void)
                 memory_end = memory_size;
 }
 
+void *restart_stack __attribute__((__section__(".data")));
+
+/*
+ * Setup new PSW and allocate stack for PSW restart interrupt
+ */
+static void __init setup_restart_psw(void)
+{
+        psw_t psw;
+
+        restart_stack = __alloc_bootmem(ASYNC_SIZE, ASYNC_SIZE, 0);
+        restart_stack += ASYNC_SIZE;
+
+        /*
+         * Setup restart PSW for absolute zero lowcore. This is necesary
+         * if PSW restart is done on an offline CPU that has lowcore zero
+         */
+        psw.mask = PSW_BASE_BITS | PSW_DEFAULT_KEY;
+        psw.addr = PSW_ADDR_AMODE | (unsigned long) psw_restart_int_handler;
+        copy_to_absolute_zero(&S390_lowcore.restart_psw, &psw, sizeof(psw));
+}
+
 static void __init
 setup_memory(void)
 {
@@ -731,6 +752,7 @@ static void __init setup_hwcaps(void)
                 strcpy(elf_platform, "z10");
                 break;
         case 0x2817:
+        case 0x2818:
                 strcpy(elf_platform, "z196");
                 break;
         }
@@ -792,6 +814,7 @@ setup_arch(char **cmdline_p)
         setup_addressing_mode();
         setup_memory();
         setup_resources();
+        setup_restart_psw();
         setup_lowcore();
 
         cpu_init();