From: Heiko Carstens Limit reported memory size to 2GB if running in 31 bit mode. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton --- arch/s390/kernel/head.S | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletion(-) diff -puN arch/s390/kernel/head.S~s390-31-bit-memory-size-limit arch/s390/kernel/head.S --- 25/arch/s390/kernel/head.S~s390-31-bit-memory-size-limit Mon Jul 11 16:37:34 2005 +++ 25-akpm/arch/s390/kernel/head.S Mon Jul 11 16:37:34 2005 @@ -535,8 +535,13 @@ startup:basr %r13,0 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 + lhi %r1,0x800 # otherwise report 2GB .Lscnd: + lhi %r3,0x800 # limit reported memory size to 2GB + cr %r1,%r3 + jl .Lno2gb + lr %r1,%r3 +.Lno2gb: xr %r3,%r3 # same logic ic %r3,.Lscpa1-PARMAREA(%r4) chi %r3,0x00 _