diff options
| author |   Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> | 2014-05-12 17:04:05 +0530 |
|---|---|---|
| committer |   Alexander Graf <agraf@suse.de> | 2014-05-30 14:26:25 +0200 |
| commit | 7310f3a5b0ecc7ac8b57e70fe395968cbe0fc40a (patch) | |
| tree | e87d1b81fc662d4fe8f69afb6c2f90655813f94d /arch/powerpc/kvm | |
| parent | PPC: KVM: Make NX bit available with magic page (diff) | |
| download | linux-dev-7310f3a5b0ecc7ac8b57e70fe395968cbe0fc40a.tar.xz linux-dev-7310f3a5b0ecc7ac8b57e70fe395968cbe0fc40a.zip | |
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 <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/powerpc/kvm')
| -rw-r--r-- | arch/powerpc/kvm/book3s_emulate.c | 7 |
1 files changed, 7 insertions, 0 deletions
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 } |