Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=29c380f5f06d0c5a320b9bb6f8987065e7b81c91 Commit: 29c380f5f06d0c5a320b9bb6f8987065e7b81c91 Parent: de46c33745f5e2ad594c72f2cf5f490861b16ce1 Author: Heiko Carstens <[EMAIL PROTECTED]> AuthorDate: Fri Apr 27 16:01:04 2007 +0200 Committer: Martin Schwidefsky <[EMAIL PROTECTED]> CommitDate: Fri Apr 27 16:01:12 2007 +0200
[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 <[EMAIL PROTECTED]> Signed-off-by: Heiko Carstens <[EMAIL PROTECTED]> --- arch/s390/kernel/early.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c index 5e47936..50538e5 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; - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html