2 files changed, 7 insertions, 7 deletions
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S
index b804c55bd919..658e8de74f88 100644
--- a/arch/s390/kernel/head.S
+++ b/arch/s390/kernel/head.S
@@ -517,10 +517,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
+        lhi   %r1,0
-        chi   %r1,0x00
+        icm   %r1,3,.Lscpincr1-PARMAREA(%r4) # use this one if != 0
-        jne   .Lscnd
+        jnz   .Lscnd
-        l     %r1,.Lscpincr2-PARMAREA(%r4) # otherwise use this one
+        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 8366793bc371..8e2caf9dc185 100644
--- a/arch/s390/kernel/head64.S
+++ b/arch/s390/kernel/head64.S
@@ -518,9 +518,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
+        lghi  %r1,0
-        chi   %r1,0x00
+        icm   %r1,3,.Lscpincr1-PARMAREA(%r4) # use this one if != 0
-        jne   .Lscnd
+        jnz   .Lscnd
        lg    %r1,.Lscpincr2-PARMAREA(%r4) # otherwise use this one
 .Lscnd:
        xr    %r3,%r3                   # same logic

diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S index b804c55bd919..658e8de74f88 100644 --- a/arch/s390/kernel/head.S +++ b/arch/s390/kernel/head.S
@@ -517,10 +517,10 @@ startup:basr %r13,0 # get base
517	l %r2, .Lrcp2-.LPG1(%r13) # try with Read SCP	517	l %r2, .Lrcp2-.LPG1(%r13) # try with Read SCP
518	b .Lservicecall-.LPG1(%r13)	518	b .Lservicecall-.LPG1(%r13)
519	.Lprocsccb:	519	.Lprocsccb:
520	lh %r1,.Lscpincr1-PARMAREA(%r4) # use this one if != 0	520	lhi %r1,0
521	chi %r1,0x00	521	icm %r1,3,.Lscpincr1-PARMAREA(%r4) # use this one if != 0
522	jne .Lscnd	522	jnz .Lscnd
523	l %r1,.Lscpincr2-PARMAREA(%r4) # otherwise use this one	523	l %r1,.Lscpincr2-PARMAREA+4(%r4) # otherwise use this one
524	.Lscnd:	524	.Lscnd:
525	xr %r3,%r3 # same logic	525	xr %r3,%r3 # same logic
526	ic %r3,.Lscpa1-PARMAREA(%r4)	526	ic %r3,.Lscpa1-PARMAREA(%r4)


diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S index 8366793bc371..8e2caf9dc185 100644 --- a/arch/s390/kernel/head64.S +++ b/arch/s390/kernel/head64.S
@@ -518,9 +518,9 @@ startup:basr %r13,0 # get base
518	l %r2,.Lrcp2-.LPG1(%r13) # try with Read SCP	518	l %r2,.Lrcp2-.LPG1(%r13) # try with Read SCP
519	b .Lservicecall-.LPG1(%r13)	519	b .Lservicecall-.LPG1(%r13)
520	.Lprocsccb:	520	.Lprocsccb:
521	lh %r1,.Lscpincr1-PARMAREA(%r4) # use this one if != 0	521	lghi %r1,0
522	chi %r1,0x00	522	icm %r1,3,.Lscpincr1-PARMAREA(%r4) # use this one if != 0
523	jne .Lscnd	523	jnz .Lscnd
524	lg %r1,.Lscpincr2-PARMAREA(%r4) # otherwise use this one	524	lg %r1,.Lscpincr2-PARMAREA(%r4) # otherwise use this one
525	.Lscnd:	525	.Lscnd:
526	xr %r3,%r3 # same logic	526	xr %r3,%r3 # same logic