From: Martin Schwidefsky <schwidefsky@de.ibm.com>
To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>,
Martin Schwidefsky <schwidefsky@de.ibm.com>
Subject: [patch 10/10] Fix memory detection.
Date: Fri, 16 Nov 2007 15:24:51 +0100 [thread overview]
Message-ID: <20071116142527.937138444@de.ibm.com> (raw)
In-Reply-To: 20071116142441.484714036@de.ibm.com
[-- Attachment #1: 010-memsize.diff --]
[-- Type: text/plain, Size: 1105 bytes --]
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Before we're getting short on memory detection fixes here is the next
one: if neither sclp nor diag260 report the storage size the detection
loop will return immediately without detecting anything. Fix this by
breaking the detection loop only if the memory end is known.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---
arch/s390/kernel/early.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -urpN linux-2.6/arch/s390/kernel/early.c linux-2.6-patched/arch/s390/kernel/early.c
--- linux-2.6/arch/s390/kernel/early.c 2007-11-16 14:27:30.000000000 +0100
+++ linux-2.6-patched/arch/s390/kernel/early.c 2007-11-16 14:27:45.000000000 +0100
@@ -200,7 +200,7 @@ static noinline __init void find_memory_
cc = __tprot(addr);
while (cc == old_cc) {
addr += CHUNK_INCR;
- if (addr >= memsize)
+ if (memsize && addr >= memsize)
break;
#ifndef CONFIG_64BIT
if (addr == ADDR2G)
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
prev parent reply other threads:[~2007-11-16 14:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-16 14:24 [patch 00/10] 2.6.24-rc s390 patch queue Martin Schwidefsky
2007-11-16 14:24 ` [patch 01/10] cio: change device sense procedure to work with pav aliases Martin Schwidefsky
2007-11-16 14:24 ` [patch 02/10] magic sysrq: check for in_atomic before doing an console_unblank Martin Schwidefsky
2007-11-16 14:24 ` [patch 03/10] Fix irq tracing and lockdep_sys_exit calls Martin Schwidefsky
2007-11-16 14:24 ` [patch 04/10] cmm: remove unused binary sysctls Martin Schwidefsky
2007-11-16 14:24 ` [patch 05/10] appldata: " Martin Schwidefsky
2007-11-16 14:24 ` [patch 06/10] Fix kernel preemption Martin Schwidefsky
2007-11-16 14:24 ` [patch 07/10] Optimize storage key handling for anonymous pages Martin Schwidefsky
2007-11-16 14:24 ` [patch 08/10] Dont overwrite lowcores on smp_send_stop() Martin Schwidefsky
2007-11-16 14:24 ` [patch 09/10] Explicitly code allocpercpu calls in iucv Martin Schwidefsky
2007-11-16 14:24 ` Martin Schwidefsky [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071116142527.937138444@de.ibm.com \
--to=schwidefsky@de.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox