From: Aneesh Kumar K.V Date: Mon, 12 May 2014 11:34:05 +0000 (+0530) Subject: KVM: PPC: BOOK3S: Always use the saved DAR value X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7310f3a5b0ecc7ac8b57e70fe395968cbe0fc40a;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git KVM: PPC: BOOK3S: Always use the saved DAR value Although it's optional, IBM POWER cpus always had DAR value set on alignment interrupt. So don't try to compute these values. Signed-off-by: Aneesh Kumar K.V Signed-off-by: Alexander Graf --- diff --git a/arch/powerpc/kvm/book3s_emulate.c b/arch/powerpc/kvm/book3s_emulate.c index 9bdff159ad2a..61f38eb470b3 100644 --- a/arch/powerpc/kvm/book3s_emulate.c +++ b/arch/powerpc/kvm/book3s_emulate.c @@ -676,6 +676,12 @@ u32 kvmppc_alignment_dsisr(struct kvm_vcpu *vcpu, unsigned int inst) ulong kvmppc_alignment_dar(struct kvm_vcpu *vcpu, unsigned int inst) { +#ifdef CONFIG_PPC_BOOK3S_64 + /* + * Linux's fix_alignment() assumes that DAR is valid, so can we + */ + return vcpu->arch.fault_dar; +#else ulong dar = 0; ulong ra = get_ra(inst); ulong rb = get_rb(inst); @@ -700,4 +706,5 @@ ulong kvmppc_alignment_dar(struct kvm_vcpu *vcpu, unsigned int inst) } return dar; +#endif }