diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2006-06-29 14:56:32 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2006-06-29 14:56:32 +0200 |
| commit | d7d23702554dc13297cff5eaf7a551c802daeab3 (patch) | |
| tree | 9d1b588323fffeb712b1c045998e9b1367be3c02 | |
| parent | 7380534314865528ef080593b291bba32fba60e8 (diff) | |
| download | op-kernel-dev-d7d23702554dc13297cff5eaf7a551c802daeab3.zip op-kernel-dev-d7d23702554dc13297cff5eaf7a551c802daeab3.tar.gz | |
[S390] memory detection.
The wrong base register is used to read a value from the sclp data
structure. The value is used to calculate the memory size.
Use correct register %r4.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| -rw-r--r-- | arch/s390/kernel/head31.S | 2 | ||||
| -rw-r--r-- | arch/s390/kernel/head64.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/head31.S b/arch/s390/kernel/head31.S index 2d3b089..8f38bfd6 100644 --- a/arch/s390/kernel/head31.S +++ b/arch/s390/kernel/head31.S @@ -87,7 +87,7 @@ startup:basr %r13,0 # get base ic %r3,.Lscpa1-PARMAREA(%r4) chi %r3,0x00 jne .Lcompmem - l %r3,.Lscpa2-PARMAREA(%r13) + l %r3,.Lscpa2-PARMAREA(%r4) .Lcompmem: mr %r2,%r1 # mem in MB on 128-bit l %r1,.Lonemb-.LPG1(%r13) diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S index f08c06f..ad5d87f 100644 --- a/arch/s390/kernel/head64.S +++ b/arch/s390/kernel/head64.S @@ -86,7 +86,7 @@ startup:basr %r13,0 # get base ic %r3,.Lscpa1-PARMAREA(%r4) chi %r3,0x00 jne .Lcompmem - l %r3,.Lscpa2-PARMAREA(%r13) + l %r3,.Lscpa2-PARMAREA(%r4) .Lcompmem: mlgr %r2,%r1 # mem in MB on 128-bit l %r1,.Lonemb-.LPG1(%r13) |
