Commit:     b075083f35309c4f3e50886d6f31a3a0e07a29b5
Parent:     e3c699b38ef3c59521fdd1732efcaaa789d81440
Author:     Heiko Carstens <[EMAIL PROTECTED]>
AuthorDate: Mon Feb 5 21:17:07 2007 +0100
Committer:  Martin Schwidefsky <[EMAIL PROTECTED]>
CommitDate: Mon Feb 5 21:17:07 2007 +0100

    [S390] Fix FCP dump feature detection.
    FCP dump feature detection works only if the sclp command in head.S
    was succesful. Since the sclp command is skipped if diag260 works,
    we don't have any dump feature detection anymore.
    Bug was introduced with d57de5a36791cb1b7285649c62f183b0d3505f7d.
    Signed-off-by: Heiko Carstens <[EMAIL PROTECTED]>
    Signed-off-by: Martin Schwidefsky <[EMAIL PROTECTED]>
 arch/s390/kernel/head64.S |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S
index 6ba3f45..e940e80 100644
--- a/arch/s390/kernel/head64.S
+++ b/arch/s390/kernel/head64.S
@@ -81,7 +81,6 @@ startup_continue:
        aghi    %r1,1                   # size is one more than end
        larl    %r2,memory_chunk
        stg     %r1,8(%r2)              # store size of chunk
-       j       .Ldonemem
        l       %r2,.Lrcp-.LPG1(%r13)   # Read SCP forced command word
@@ -156,6 +155,11 @@ startup_continue:
 # find memory chunks.
+       larl    %r9,memory_chunk        # skip tprot loop if diag260
+       lg      %r9,8(%r9)              # memory detection was successful
+       ltgr    %r9,%r9
+       jne     .Ldonemem
        lgr     %r9,%r3                 # end of mem
        larl    %r1,.Lchkmem            # set program check address
        stg     %r1,__LC_PGM_NEW_PSW+8
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

Reply via email to