Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7d23702 authored Jun 29, 2006 by Heiko Carstens Committed by Martin Schwidefsky Jun 29, 2006

[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>

parent 73805343

arch/s390/kernel/head31.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

arch/s390/kernel/head64.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)