Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b4554aa authored Nov 07, 2005 by Heiko Carstens Committed by Linus Torvalds Nov 07, 2005

[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>

parent 373c491f

arch/s390/kernel/head.S

+1 −2

Original line number	Diff line number	Diff line
		@@ -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:

arch/s390/kernel/head64.S

+2 −3

Original line number	Diff line number	Diff line
		@@ -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: