commit d0adf747c9caa8b01d0c1f987e306b7c6aaa5a04
author Marc Zyngier <marc.zyngier@arm.com> Tue Sep 18 11:28:57 2012 +0100
committer Christoffer Dall <cdall@cs.columbia.edu> Wed Mar 06 15:48:42 2013 -0800
tree 998cdabaae89710993b1933a46d83005733702c7
parent 7c511b881f79a2a390e7c2e9a39b9a881255e614

ARM: KVM: abstract HSR_SRT_{MASK,SHIFT} away

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

arch/arm/kvm/mmio.c

diff --git a/arch/arm/kvm/mmio.c b/arch/arm/kvm/mmio.c
index 058029c..586063d 100644
--- a/arch/arm/kvm/mmio.c
+++ b/arch/arm/kvm/mmio.c
@@ -94,7 +94,7 @@
 
 	is_write = kvm_vcpu_dabt_iswrite(vcpu);
 	sign_extend = kvm_vcpu_dabt_issext(vcpu);
-	rt = (kvm_vcpu_get_hsr(vcpu) & HSR_SRT_MASK) >> HSR_SRT_SHIFT;
+	rt = kvm_vcpu_dabt_get_rd(vcpu);
 
 	if (kvm_vcpu_reg_is_pc(vcpu, rt)) {
 		/* IO memory trying to read/write pc */