Skip to contentSkip to conversation

s390: memory detection.

PATCH New Martin Schwidefsky 1 participant 1 message Jun 14, 2006 s390

lore
Share & tools
lore
#0 lore raw

PATCH 3/24 s390: memory detection.

From: Heiko Carstens <[email protected]>

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

---

 arch/s390/kernel/head31.S |    2 +-
 arch/s390/kernel/head64.S |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/s390/kernel/head31.S +1 -1
diff -urpN linux-2.6/arch/s390/kernel/head31.S linux-2.6-patched/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)
arch/s390/kernel/head64.S +1 -1
diff -urpN linux-2.6/arch/s390/kernel/head64.S linux-2.6-patched/arch/s390/kernel/head64.S
@@ -86,7 +86,7 @@ startup:basr  %r13,0                    
 	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)