3.7-stable patches

added patches:
	kvm-ppc-44x-fix-dcr-read-write.patch

diff --git a/queue-3.7/kvm-ppc-44x-fix-dcr-read-write.patch b/queue-3.7/kvm-ppc-44x-fix-dcr-read-write.patch
new file mode 100644 (file)
index 0000000..ad519a7
--- /dev/null
+++ b/queue-3.7/kvm-ppc-44x-fix-dcr-read-write.patch
@@ -0,0 +1,39 @@
+From e43a028752fed049e4bd94ef895542f96d79fa74 Mon Sep 17 00:00:00 2001
+From: Alexander Graf <agraf@suse.de>
+Date: Sat, 6 Oct 2012 03:56:35 +0200
+Subject: KVM: PPC: 44x: fix DCR read/write
+
+From: Alexander Graf <agraf@suse.de>
+
+commit e43a028752fed049e4bd94ef895542f96d79fa74 upstream.
+
+When remembering the direction of a DCR transaction, we should write
+to the same variable that we interpret on later when doing vcpu_run
+again.
+
+Signed-off-by: Alexander Graf <agraf@suse.de>
+Signed-off-by: CAI Qian <caiqian@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/powerpc/kvm/44x_emulate.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/arch/powerpc/kvm/44x_emulate.c
++++ b/arch/powerpc/kvm/44x_emulate.c
+@@ -76,6 +76,7 @@ int kvmppc_core_emulate_op(struct kvm_ru
+                               run->dcr.dcrn = dcrn;
+                               run->dcr.data =  0;
+                               run->dcr.is_write = 0;
++                              vcpu->arch.dcr_is_write = 0;
+                               vcpu->arch.io_gpr = rt;
+                               vcpu->arch.dcr_needed = 1;
+                               kvmppc_account_exit(vcpu, DCR_EXITS);
+@@ -94,6 +95,7 @@ int kvmppc_core_emulate_op(struct kvm_ru
+                               run->dcr.dcrn = dcrn;
+                               run->dcr.data = kvmppc_get_gpr(vcpu, rs);
+                               run->dcr.is_write = 1;
++                              vcpu->arch.dcr_is_write = 1;
+                               vcpu->arch.dcr_needed = 1;
+                               kvmppc_account_exit(vcpu, DCR_EXITS);
+                               emulated = EMULATE_DO_DCR;

diff --git a/queue-3.7/series b/queue-3.7/series
index cd4f1b7abc13ae250715d51c05484cb628391293..0bdb1082a2cb2fa69e1e3931595bc3b7c9aa2820 100644 (file)
--- a/queue-3.7/series
+++ b/queue-3.7/series
@@ -186,3 +186,4 @@ dm-thin-fix-race-between-simultaneous-io-and-discards-to-same-block.patch
 revert-rt2x00-don-t-let-mac80211-send-a-bar-when-an-ampdu-subframe-fails.patch
 edac-fix-kernel-panic-on-module-unloading.patch
 drm-i915-disable-cpt-phase-pointer-fdi-rx-workaround.patch
+kvm-ppc-44x-fix-dcr-read-write.patch