summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSanjay Lal <sanjayl@kymasys.com>2012-11-21 18:34:15 -0800
committerRalf Baechle <ralf@linux-mips.org>2013-05-09 17:48:22 +0200
commit2f4d9b5442766ec9ae5c2b217badfd9de320e1ea (patch)
treed80b0ec897dad6013676e1826968baad27f6e3a6
parent82d45de6554951b6e863697cca95c927fb90724c (diff)
downloadlinux-2f4d9b5442766ec9ae5c2b217badfd9de320e1ea.tar.gz
linux-2f4d9b5442766ec9ae5c2b217badfd9de320e1ea.tar.bz2
linux-2f4d9b5442766ec9ae5c2b217badfd9de320e1ea.zip
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>
-rw-r--r--virt/kvm/kvm_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index adc68feb5c5a..845cd9cf5189 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1954,7 +1954,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.