From: Alexander Graf <agraf@suse.de>
Date: Wed, 24 Mar 2010 20:48:26 +0000 (+0100)
Subject: KVM: PPC: Make XER load 32 bit
X-Git-Tag: firefly_0821_release~9833^2~2050^2~127
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1bec1677ca5b3406dc1f174b61beaeb832eed715;p=firefly-linux-kernel-4.4.55.git

KVM: PPC: Make XER load 32 bit

We have a 32 bit value in the PACA to store XER in. We also do an stw
when storing XER in there. But then we load it with ld, completely
screwing it up on every entry.

Welcome to the Big Endian world.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Avi Kivity <avi@redhat.com>
---

diff --git a/arch/powerpc/kvm/book3s_64_slb.S b/arch/powerpc/kvm/book3s_64_slb.S
index 35b762722187..091967907954 100644
--- a/arch/powerpc/kvm/book3s_64_slb.S
+++ b/arch/powerpc/kvm/book3s_64_slb.S
@@ -145,7 +145,7 @@ slb_do_enter:
 	lwz	r11, (PACA_KVM_CR)(r13)
 	mtcr	r11
 
-	ld	r11, (PACA_KVM_XER)(r13)
+	lwz	r11, (PACA_KVM_XER)(r13)
 	mtxer	r11
 
 	ld	r11, (PACA_KVM_R11)(r13)