5 files changed, 46 insertions, 19 deletions

diff --git a/arch/s390/kernel/compat_ioctl.c b/arch/s390/kernel/compat_ioctl.c
index 03d03c6d3c..24a1e9f069 100644
--- a/arch/s390/kernel/compat_ioctl.c
+++ b/arch/s390/kernel/compat_ioctl.c
@@ -42,7 +42,6 @@ struct ioctl_trans ioctl_start[] = {
 #include "../../../fs/compat_ioctl.c"
 
 /* s390 only ioctls */
-#if defined(CONFIG_DASD) || defined(CONFIG_DASD_MODULE)
 COMPATIBLE_IOCTL(DASDAPIVER)
 COMPATIBLE_IOCTL(BIODASDDISABLE)
 COMPATIBLE_IOCTL(BIODASDENABLE)
@@ -59,16 +58,11 @@ COMPATIBLE_IOCTL(BIODASDPRRD)
 COMPATIBLE_IOCTL(BIODASDPSRD)
 COMPATIBLE_IOCTL(BIODASDGATTR)
 COMPATIBLE_IOCTL(BIODASDSATTR)
-#if defined(CONFIG_DASD_CMB) || defined(CONFIG_DASD_CMB_MODULE)
 COMPATIBLE_IOCTL(BIODASDCMFENABLE)
 COMPATIBLE_IOCTL(BIODASDCMFDISABLE)
 COMPATIBLE_IOCTL(BIODASDREADALLCMB)
-#endif
-#endif
 
-#if defined(CONFIG_S390_TAPE) || defined(CONFIG_S390_TAPE_MODULE)
 COMPATIBLE_IOCTL(TAPE390_DISPLAY)
-#endif
 
 /* s390 doesn't need handlers here */
 COMPATIBLE_IOCTL(TIOCGSERIAL)
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S
index b804c55bd9..fc8bf5e285 100644
--- a/arch/s390/kernel/head.S
+++ b/arch/s390/kernel/head.S
@@ -345,10 +345,25 @@ iplstart:
         bno   .Lnoreset
         la    %r2,.Lreset              
         lhi   %r3,26
-        .long 0x83230008
+        diag  %r2,%r3,8
+        mvc   0x78(8),.Lrdrnewpsw              # set up IO interrupt psw
+.Lwaitrdrirq:
+        lpsw  .Lrdrwaitpsw
+.Lrdrint:
+        c     %r1,0xb8                         # compare subchannel number
+        bne   .Lwaitrdrirq
+        la    %r5,.Lirb
+        tsch  0(%r5)
 .Lnoreset:
+        b     .Lnoload
+
+        .align 8
+.Lrdrnewpsw:
+        .long  0x00080000,0x80000000+.Lrdrint
+.Lrdrwaitpsw:
+        .long  0x020a0000,0x80000000+.Lrdrint
 #endif
-        
+
 #
 # everything loaded, go for it
 #
@@ -517,10 +532,10 @@ startup:basr  %r13,0                     # get base
         l     %r2, .Lrcp2-.LPG1(%r13)   # try with Read SCP
         b     .Lservicecall-.LPG1(%r13)
 .Lprocsccb:
-        lh    %r1,.Lscpincr1-PARMAREA(%r4) # use this one if != 0
-        chi   %r1,0x00
-        jne   .Lscnd
-        l     %r1,.Lscpincr2-PARMAREA(%r4) # otherwise use this one
+        lhi   %r1,0
+        icm   %r1,3,.Lscpincr1-PARMAREA(%r4) # use this one if != 0
+        jnz   .Lscnd
+        l     %r1,.Lscpincr2-PARMAREA+4(%r4) # otherwise use this one
 .Lscnd:
         xr    %r3,%r3                   # same logic
         ic    %r3,.Lscpa1-PARMAREA(%r4)
diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S
index 8366793bc3..f525c0c212 100644
--- a/arch/s390/kernel/head64.S
+++ b/arch/s390/kernel/head64.S
@@ -344,10 +344,25 @@ iplstart:
         bno   .Lnoreset
         la    %r2,.Lreset              
         lhi   %r3,26
-        .long 0x83230008
+        diag  %r2,%r3,8
+        mvc   0x78(8),.Lrdrnewpsw              # set up IO interrupt psw
+.Lwaitrdrirq:
+        lpsw  .Lrdrwaitpsw
+.Lrdrint:
+        c     %r1,0xb8                         # compare subchannel number
+        bne   .Lwaitrdrirq
+        la    %r5,.Lirb
+        tsch  0(%r5)
 .Lnoreset:
+        b     .Lnoload
+
+        .align 8
+.Lrdrnewpsw:
+        .long  0x00080000,0x80000000+.Lrdrint
+.Lrdrwaitpsw:
+        .long  0x020a0000,0x80000000+.Lrdrint
 #endif
-        
+
 #
 # everything loaded, go for it
 #
@@ -518,9 +533,9 @@ startup:basr  %r13,0                     # get base
         l     %r2,.Lrcp2-.LPG1(%r13)    # try with Read SCP
         b     .Lservicecall-.LPG1(%r13)
 .Lprocsccb:
-        lh    %r1,.Lscpincr1-PARMAREA(%r4) # use this one if != 0
-        chi   %r1,0x00
-        jne   .Lscnd
+        lghi  %r1,0
+        icm   %r1,3,.Lscpincr1-PARMAREA(%r4) # use this one if != 0
+        jnz   .Lscnd
         lg    %r1,.Lscpincr2-PARMAREA(%r4) # otherwise use this one
 .Lscnd:
         xr    %r3,%r3                   # same logic
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index 8b90e9528b..ca34b6f34b 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -668,7 +668,10 @@ asmlinkage void space_switch_exception(struct pt_regs * regs, long int_code)
 
 asmlinkage void kernel_stack_overflow(struct pt_regs * regs)
 {
-        die("Kernel stack overflow", regs, 0);
+        bust_spinlocks(1);
+        printk("Kernel stack overflow.\n");
+        show_regs(regs);
+        bust_spinlocks(0);
         panic("Corrupt kernel stack, can't continue.");
 }
 
diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c
index f5a5bc09b8..2d5cb13857 100644
--- a/arch/s390/mm/cmm.c
+++ b/arch/s390/mm/cmm.c
@@ -21,7 +21,7 @@
 #include <asm/uaccess.h>
 
 static char *sender = "VMRMSVM";
-module_param(sender, charp, 0);
+module_param(sender, charp, 0400);
 MODULE_PARM_DESC(sender,
                  "Guest name that may send SMSG messages (default VMRMSVM)");