[PATCH] s390: memory detection > 32GB

[safe/jmp/linux-2.6] / arch / s390 / kernel / head64.S

diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S
index 8366793..8e2caf9 100644 (file)
--- 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
-       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