---

yaml --- r: 375184 b: refs/heads/master c: 2f4d9b5 h: refs/heads/master v: v3
git-mirror · May 9, 2013 · 6465f85 · 6465f85
1 parent bcf376d
commit 6465f85
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82d45de6554951b6e863697cca95c927fb90724c
+refs/heads/master: 2f4d9b5442766ec9ae5c2b217badfd9de320e1ea
diff --git a/trunk/virt/kvm/kvm_main.c b/trunk/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.