1 files changed, 13 insertions, 6 deletions

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index df83215beac3..b6d740ac0e6e 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -198,11 +198,11 @@ static void __init conmode_default(void)
         char *ptr;
 
         if (MACHINE_IS_VM) {
-                __cpcmd("QUERY CONSOLE", query_buffer, 1024);
+                __cpcmd("QUERY CONSOLE", query_buffer, 1024, NULL);
                 console_devno = simple_strtoul(query_buffer + 5, NULL, 16);
                 ptr = strstr(query_buffer, "SUBCHANNEL =");
                 console_irq = simple_strtoul(ptr + 13, NULL, 16);
-                __cpcmd("QUERY TERM", query_buffer, 1024);
+                __cpcmd("QUERY TERM", query_buffer, 1024, NULL);
                 ptr = strstr(query_buffer, "CONMODE");
                 /*
                  * Set the conmode to 3215 so that the device recognition 
@@ -211,7 +211,7 @@ static void __init conmode_default(void)
                  * 3215 and the 3270 driver will try to access the console
                  * device (3215 as console and 3270 as normal tty).
                  */
-                __cpcmd("TERM CONMODE 3215", NULL, 0);
+                __cpcmd("TERM CONMODE 3215", NULL, 0, NULL);
                 if (ptr == NULL) {
 #if defined(CONFIG_SCLP_CONSOLE)
                         SET_CONSOLE_SCLP;
@@ -414,7 +414,8 @@ setup_lowcore(void)
         lc->program_new_psw.mask = PSW_KERNEL_BITS;
         lc->program_new_psw.addr =
                 PSW_ADDR_AMODE | (unsigned long)pgm_check_handler;
-        lc->mcck_new_psw.mask = PSW_KERNEL_BITS;
+        lc->mcck_new_psw.mask =
+                PSW_KERNEL_BITS & ~PSW_MASK_MCHECK & ~PSW_MASK_DAT;
         lc->mcck_new_psw.addr =
                 PSW_ADDR_AMODE | (unsigned long) mcck_int_handler;
         lc->io_new_psw.mask = PSW_KERNEL_BITS;
@@ -424,12 +425,18 @@ setup_lowcore(void)
         lc->kernel_stack = ((unsigned long) &init_thread_union) + THREAD_SIZE;
         lc->async_stack = (unsigned long)
                 __alloc_bootmem(ASYNC_SIZE, ASYNC_SIZE, 0) + ASYNC_SIZE;
-#ifdef CONFIG_CHECK_STACK
         lc->panic_stack = (unsigned long)
                 __alloc_bootmem(PAGE_SIZE, PAGE_SIZE, 0) + PAGE_SIZE;
-#endif
         lc->current_task = (unsigned long) init_thread_union.thread_info.task;
         lc->thread_info = (unsigned long) &init_thread_union;
+#ifndef CONFIG_ARCH_S390X
+        if (MACHINE_HAS_IEEE) {
+                lc->extended_save_area_addr = (__u32)
+                        __alloc_bootmem(PAGE_SIZE, PAGE_SIZE, 0);
+                /* enable extended save area */
+                ctl_set_bit(14, 29);
+        }
+#endif
 #ifdef CONFIG_ARCH_S390X
         if (MACHINE_HAS_DIAG44)
                 lc->diag44_opcode = 0x83000044;