From: Heiko Carstens Date: Mon, 7 Nov 2005 08:59:04 +0000 (-0800) Subject: [PATCH] s390: memory query wait psw X-Git-Tag: v2.6.15-rc1~647 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b4554aa21270f5b6fa19a9dd2285f16e11f15f1;p=linux-2.6 [PATCH] s390: memory query wait psw Don't switch back to 24 bit addressing mode when waiting for an external interrupt and set the correct bit in wait PSW (external mask instead of I/O mask). Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S index 039354d723..4ca0293321 100644 --- a/arch/s390/kernel/head.S +++ b/arch/s390/kernel/head.S @@ -572,8 +572,7 @@ startup:basr %r13,0 # get base .Lcr: .long 0x00 # place holder for cr0 .Lwaitsclp: - .long 0x020A0000 - .long .Lsclph + .long 0x010a0000,0x80000000 + .Lsclph .Lrcp: .int 0x00120001 # Read SCP forced code .Lrcp2: diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S index 193aafa72f..d9be8f96f2 100644 --- a/arch/s390/kernel/head64.S +++ b/arch/s390/kernel/head64.S @@ -530,7 +530,7 @@ startup:basr %r13,0 # get base be .Lfchunk-.LPG1(%r13) # leave chi %r1,2 be .Lservicecall-.LPG1(%r13) - lpsw .Lwaitsclp-.LPG1(%r13) + lpswe .Lwaitsclp-.LPG1(%r13) .Lsclph: lh %r1,.Lsccbr-PARMAREA(%r4) chi %r1,0x10 # 0x0010 is the sucess code @@ -567,8 +567,7 @@ startup:basr %r13,0 # get base .Lcr: .quad 0x00 # place holder for cr0 .Lwaitsclp: - .long 0x020A0000 - .quad .Lsclph + .quad 0x0102000180000000,.Lsclph .Lrcp: .int 0x00120001 # Read SCP forced code .Lrcp2: