[patch 01/38] memory detection: stop at first memory hole.

Martin Schwidefsky
2007-04-27T14:15:54Z

[-- Attachment #1: 001-memory-hole.diff --]
[-- Type: text/plain, Size: 1137 bytes --]

From: Heiko Carstens <heiko.carstens@de.ibm.com>

If both sclp and diag memory detection don't work stop at the first
memory hole. Otherwise the code might loop forever...

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
---

arch/s390/kernel/early.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)

Index: quilt-2.6/arch/s390/kernel/early.c
===================================================================
--- quilt-2.6.orig/arch/s390/kernel/early.c 2007-04-27 16:01:49.000000000 +0200
+++ quilt-2.6/arch/s390/kernel/early.c 2007-04-27 16:04:52.000000000 +0200
@@ -253,11 +253,10 @@
break;
#endif
/*
- * Finish memory detection at the first hole, unless
- * - we reached the hsa -> skip it.
- * - we know there must be more.
+ * Finish memory detection at the first hole
+ * if storage size is unknown.
*/
- if (cc == -1UL && !memsize && old_addr != ADDR2G)
+ if (cc == -1UL && !memsize)
break;
if (memsize && addr >= memsize)
break;