Merge tag 'kvm-arm-for-v4.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master

KVM/ARM Fixes for v4.4-rc3.

Includes some timer fixes, properly unmapping PTEs, an errata fix, and two
tweaks to the EL2 panic code.

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;