From: Sascha Silbe <silbe@linux.vnet.ibm.com>
Date: Wed, 4 Nov 2015 13:16:57 +0000 (+0100)
Subject: s390/sclp: _sclp_wait_int(): retain full PSW mask
X-Git-Tag: firefly_0821_release~176^2~672^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f07f21b3e20c11017cea17ec841f0150a62aac53;p=firefly-linux-kernel-4.4.55.git

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

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;