commit 9b4554aa21270f5b6fa19a9dd2285f16e11f15f1
author Heiko Carstens <heiko.carstens@de.ibm.com> Mon Nov 07 00:59:04 2005 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> Mon Nov 07 07:53:33 2005 -0800
tree 48624f0a859445f6e28b45c5d4c64ef144e16f10
parent 373c491f6d15f29ab2f87d4a60f90cb0b770aaf6

[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 <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

arch/s390/kernel/head.S

diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S
index 039354d..4ca0293 100644
--- a/arch/s390/kernel/head.S
+++ b/arch/s390/kernel/head.S
@@ -572,8 +572,7 @@
 .Lcr:
 	.long 0x00			# place holder for cr0
 .Lwaitsclp:
-	.long 0x020A0000
-	.long .Lsclph
+	.long 0x010a0000,0x80000000 + .Lsclph
 .Lrcp:
 	.int 0x00120001			# Read SCP forced code
 .Lrcp2: