diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2005-07-27 11:45:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 16:26:05 -0700 |
| commit | f878e4367580f37327e68ce2c6861245077f0904 (patch) | |
| tree | 5414f367d9397debdd818568b958f779df7ac817 | |
| parent | 4111796d89b8cfa36054d65d9858460b5ec0e8c7 (diff) | |
| download | kernel_samsung_tuna-f878e4367580f37327e68ce2c6861245077f0904.zip kernel_samsung_tuna-f878e4367580f37327e68ce2c6861245077f0904.tar.gz kernel_samsung_tuna-f878e4367580f37327e68ce2c6861245077f0904.tar.bz2 | |
[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>
| -rw-r--r-- | arch/s390/kernel/head.S | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S index 928ca65..d12cff1 100644 --- a/arch/s390/kernel/head.S +++ b/arch/s390/kernel/head.S @@ -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 |