summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2012-04-27 01:00:17 +0200
committerAlexander Graf <agraf@suse.de>2012-05-06 16:19:10 +0200
commit978b4fae45b3fae803a9f56e2262f01f71b7dbc9 (patch)
treeb19c22dc9280d4e97bf5c9463882fd50053148b9 /arch/powerpc
parentKVM: PPC: bookehv: Use lwz/stw instead of PPC_LL/PPC_STL for 32-bit fields (diff)
downloadlinux-978b4fae45b3fae803a9f56e2262f01f71b7dbc9.tar.xz
linux-978b4fae45b3fae803a9f56e2262f01f71b7dbc9.zip
KVM: PPC: Fix stbux emulation
Stbux writes the address it's operating on to the register specified in ra, not into the data source register. Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/kvm/emulate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c
index b5872f61a213..a27d4dc3b4a3 100644
--- a/arch/powerpc/kvm/emulate.c
+++ b/arch/powerpc/kvm/emulate.c
@@ -229,7 +229,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
emulated = kvmppc_handle_store(run, vcpu,
kvmppc_get_gpr(vcpu, rs),
1, 1);
- kvmppc_set_gpr(vcpu, rs, vcpu->arch.vaddr_accessed);
+ kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
break;
case OP_31_XOP_LHAX: