Commit f878e436 authored by Heiko Carstens's avatar Heiko Carstens Committed by Linus Torvalds
Browse files

[PATCH] s390: 31 bit memory size limit 



Limit reported memory size to 2GB if running in 31 bit mode.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4111796d

arch/s390/kernel/head.S

+6 −1
Original line number Diff line number Diff line
@@ -535,8 +535,13 @@ startup:basr %r13,0 # get base 
	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