aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2005-07-27 14:45:05 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-27 19:26:05 -0400
commitf878e4367580f37327e68ce2c6861245077f0904 (patch)
tree5414f367d9397debdd818568b958f779df7ac817 /arch/s390
parent4111796d89b8cfa36054d65d9858460b5ec0e8c7 (diff)
[PATCH] s390: 31 bit memory size limit
Limit reported memory size to 2GB if running in 31 bit mode. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kernel/head.S7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S
index 928ca65e8bb..d12cff11b4b 100644
--- a/arch/s390/kernel/head.S
+++ b/arch/s390/kernel/head.S
@@ -535,8 +535,13 @@ startup:basr %r13,0 # get base
535 lhi %r1,0 535 lhi %r1,0
536 icm %r1,3,.Lscpincr1-PARMAREA(%r4) # use this one if != 0 536 icm %r1,3,.Lscpincr1-PARMAREA(%r4) # use this one if != 0
537 jnz .Lscnd 537 jnz .Lscnd
538 l %r1,.Lscpincr2-PARMAREA+4(%r4) # otherwise use this one 538 lhi %r1,0x800 # otherwise report 2GB
539.Lscnd: 539.Lscnd:
540 lhi %r3,0x800 # limit reported memory size to 2GB
541 cr %r1,%r3
542 jl .Lno2gb
543 lr %r1,%r3
544.Lno2gb:
540 xr %r3,%r3 # same logic 545 xr %r3,%r3 # same logic
541 ic %r3,.Lscpa1-PARMAREA(%r4) 546 ic %r3,.Lscpa1-PARMAREA(%r4)
542 chi %r3,0x00 547 chi %r3,0x00