From: Sanjay Lal <sanjayl@kymasys.com>
Date: Thu, 22 Nov 2012 02:34:15 +0000 (-0800)
Subject: KVM/MIPS32: Do not call vcpu_load when injecting interrupts.
X-Git-Tag: next-20130218~108^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b5381b07ce572361a7e98e9c355d6c10403b8eba;p=karo-tx-linux.git

KVM/MIPS32: Do not call vcpu_load when injecting interrupts.

Signed-off-by: Sanjay Lal <sanjayl@kymasys.com>
Cc: kvm@vger.kernel.org
Cc: linux-mips@linux-mips.org
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 1cd693a76a51..809bc74711f2 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1883,7 +1883,7 @@ static long kvm_vcpu_ioctl(struct file *filp,
 	if (vcpu->kvm->mm != current->mm)
 		return -EIO;
 
-#if defined(CONFIG_S390) || defined(CONFIG_PPC)
+#if defined(CONFIG_S390) || defined(CONFIG_PPC) || defined(CONFIG_MIPS)
 	/*
 	 * Special cases: vcpu ioctls that are asynchronous to vcpu execution,
 	 * so vcpu_load() would break it.