Am 09.12.2016 um 08:02 schrieb Liang Li:
Use '||' is more efficient than '|' at this point. Signed-off-by: Liang Li <liang.z.li@xxxxxxxxx> --- arch/x86/kvm/mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index d9c7e98..16c0b00 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -3315,7 +3315,7 @@ static gpa_t nonpaging_gva_to_gpa_nested(struct kvm_vcpu *vcpu, gva_t vaddr, { int bit7 = (pte >> 7) & 1, low6 = pte & 0x3f; - return (pte & rsvd_check->rsvd_bits_mask[bit7][level-1]) | + return (pte & rsvd_check->rsvd_bits_mask[bit7][level-1]) || ((rsvd_check->bad_mt_xwr & (1ull << low6)) != 0); }
This isn't really a fix as given in the subject, is it? The != 0 is also superfluous, but not sure if these two things are really worth touching it. -- David -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html