diff options
author | Martin Schwidefsky | 2017-10-12 13:24:46 +0200 |
---|---|---|
committer | Martin Schwidefsky | 2017-10-19 17:07:37 +0200 |
commit | cc65450c8337848f97e893c5c3de973ece73aabf (patch) | |
tree | a585e87637e1e56a88eb47e6f50bc2c903489cdc /arch/s390/kvm | |
parent | s390/ctl_reg: use decoding unions in update_cr_regs (diff) | |
download | kernel-qcow2-linux-cc65450c8337848f97e893c5c3de973ece73aabf.tar.gz kernel-qcow2-linux-cc65450c8337848f97e893c5c3de973ece73aabf.tar.xz kernel-qcow2-linux-cc65450c8337848f97e893c5c3de973ece73aabf.zip |
s390/ctl_reg: move control register definitions to ctl_reg.h
The nmi.h header has some constant defines for control register bits.
These definitions should really be located in ctl_reg.h. Move and
rename the defines.
Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Reviewed-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kvm')
-rw-r--r-- | arch/s390/kvm/interrupt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index a832ad031cee..329b2843fee2 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c @@ -2483,11 +2483,11 @@ void kvm_s390_reinject_machine_check(struct kvm_vcpu *vcpu, mci.val = mcck_info->mcic; if (mci.sr) - cr14 |= MCCK_CR14_RECOVERY_SUB_MASK; + cr14 |= CR14_RECOVERY_SUBMASK; if (mci.dg) - cr14 |= MCCK_CR14_DEGRAD_SUB_MASK; + cr14 |= CR14_DEGRADATION_SUBMASK; if (mci.w) - cr14 |= MCCK_CR14_WARN_SUB_MASK; + cr14 |= CR14_WARNING_SUBMASK; mchk = mci.ck ? &inti.mchk : &irq.u.mchk; mchk->cr14 = cr14; |