[Android-virt] [PATCH 1/3] ARM: KVM: Use bit operations when dealing with addresses

[marc.zyngier at arm.com (Marc Zyngier)]

Signed-off-by: Marc Zyngier <marc.zyngier at arm.com>
---
 arch/arm/kvm/mmu.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index 03ac945..889b2ee 100644
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -536,7 +536,7 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run)
 		}
 
 		/* Adjust page offset */
-		fault_ipa += vcpu->arch.hdfar % PAGE_SIZE;
+		fault_ipa |= vcpu->arch.hdfar & ~PAGE_MASK;
 		return io_mem_abort(vcpu, run, fault_ipa, memslot);
 	}
 
-- 
1.7.7.1