[S390] memory detection: stop at first memory hole.

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>

1 files changed, 3 insertions, 4 deletions

diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index 5e47936573f2..50538e545618 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -253,11 +253,10 @@ static noinline __init void find_memory_chunks(unsigned long memsize)
                         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;