2 files changed, 34 insertions, 4 deletions

diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S
index 658e8de74f88..fc8bf5e285f6 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
 #
diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S
index 8e2caf9dc185..f525c0c21250 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
 #