From: Nadav Amit <namit@cs.technion.ac.il>
Date: Wed, 19 Nov 2014 15:43:13 +0000 (+0200)
Subject: KVM: x86: Move __linearize masking of la into switch
X-Git-Tag: v3.19-rc1~36^2~48
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=31ff64881bed80456c5d37df905bdb66cdf29abe;p=~emulex%2Finfiniband.git

KVM: x86: Move __linearize masking of la into switch

In __linearize there is check of the condition whether to check if masking of
the linear address is needed.  It occurs immediately after switch that
evaluates the same condition.  Merge them.

Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 57dc0d79c10..19a59f3f702 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -670,10 +670,9 @@ static __always_inline int __linearize(struct x86_emulate_ctxt *ctxt,
 		}
 		if (size > *max_size)
 			goto bad;
+		la &= (u32)-1;
 		break;
 	}
-	if (ctxt->mode != X86EMUL_MODE_PROT64)
-		la &= (u32)-1;
 	if (insn_aligned(ctxt, size) && ((la & (size - 1)) != 0))
 		return emulate_gp(ctxt, 0);
 	*linear = la;