diff options
author | Tudor Laurentiu <b10716@freescale.com> | 2015-05-25 11:48:39 +0300 |
---|---|---|
committer | Alexander Graf <agraf@suse.de> | 2015-08-22 11:16:16 +0200 |
commit | f5ffe330f5e63325000f58ed982a159c512f6db3 (patch) | |
tree | e93d7a96ee0c4cf63e7a5e04da8539f15e9248db /arch/powerpc/kvm/e500_mmu.c | |
parent | 4d283ec908e617fa28bcb06bce310206f0655d67 (diff) | |
download | talos-obmc-linux-f5ffe330f5e63325000f58ed982a159c512f6db3.tar.gz talos-obmc-linux-f5ffe330f5e63325000f58ed982a159c512f6db3.zip |
KVM: PPC: fix suspicious use of conditional operator
This was signaled by a static code analysis tool.
Signed-off-by: Laurentiu Tudor <Laurentiu.Tudor@freescale.com>
Reviewed-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/powerpc/kvm/e500_mmu.c')
-rw-r--r-- | arch/powerpc/kvm/e500_mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/e500_mmu.c b/arch/powerpc/kvm/e500_mmu.c index 50860e919cb8..29911a07bcdb 100644 --- a/arch/powerpc/kvm/e500_mmu.c +++ b/arch/powerpc/kvm/e500_mmu.c @@ -377,7 +377,7 @@ int kvmppc_e500_emul_tlbsx(struct kvm_vcpu *vcpu, gva_t ea) | MAS0_NV(vcpu_e500->gtlb_nv[tlbsel]); vcpu->arch.shared->mas1 = (vcpu->arch.shared->mas6 & MAS6_SPID0) - | (vcpu->arch.shared->mas6 & (MAS6_SAS ? MAS1_TS : 0)) + | ((vcpu->arch.shared->mas6 & MAS6_SAS) ? MAS1_TS : 0) | (vcpu->arch.shared->mas4 & MAS4_TSIZED(~0)); vcpu->arch.shared->mas2 &= MAS2_EPN; vcpu->arch.shared->mas2 |= vcpu->arch.shared->mas4 & |