summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSascha Silbe <silbe@linux.vnet.ibm.com>2015-11-04 14:16:57 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2015-11-12 13:08:00 +0100
commitf07f21b3e20c11017cea17ec841f0150a62aac53 (patch)
tree89801e38852b3fb6c74cc5a352656af3a81d6c52 /arch
parents390/zcrypt: Fix initialisation when zcrypt is built-in (diff)
downloadlinux-f07f21b3e20c11017cea17ec841f0150a62aac53.tar.xz
linux-f07f21b3e20c11017cea17ec841f0150a62aac53.zip
s390/sclp: _sclp_wait_int(): retain full PSW mask
There's no reason to clear all PSW mask bits other than the addressing mode bits. Just use the previous PSW mask as-is. Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com> Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/kernel/sclp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/sclp.c b/arch/s390/kernel/sclp.c
index fa0bdff1d413..9fe7781a45cd 100644
--- a/arch/s390/kernel/sclp.c
+++ b/arch/s390/kernel/sclp.c
@@ -21,7 +21,7 @@ static void _sclp_wait_int(void)
__ctl_load(cr0_new, 0, 0);
psw_ext_save = S390_lowcore.external_new_psw;
- psw_mask = __extract_psw() & (PSW_MASK_EA | PSW_MASK_BA);
+ psw_mask = __extract_psw();
S390_lowcore.external_new_psw.mask = psw_mask;
psw_wait.mask = psw_mask | PSW_MASK_EXT | PSW_MASK_WAIT;
S390_lowcore.ext_int_code = 0;