---

yaml
---
r: 202287
b: refs/heads/master
c: 19483d1
h: refs/heads/master
i:
  202285: 09e7cad
  202283: 857a45b
  202279: cc2c7c6
  202271: e69e511
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc923cc93b7719576f20687e4cb07751601fbbb3
+refs/heads/master: 19483d144023f7f4817dedafe26d5fe9ff2e7087

trunk/arch/powerpc/kvm/powerpc.c

@@ -512,15 +512,17 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
 	void __user *argp = (void __user *)arg;
 	long r;
 
-	switch (ioctl) {
-	case KVM_INTERRUPT: {
+	if (ioctl == KVM_INTERRUPT) {
 		struct kvm_interrupt irq;
 		r = -EFAULT;
 		if (copy_from_user(&irq, argp, sizeof(irq)))
-			goto out;
+			goto out_nolock;
 		r = kvm_vcpu_ioctl_interrupt(vcpu, &irq);
-		break;
+		goto out_nolock;
 	}
+
+	vcpu_load(vcpu);
+	switch (ioctl) {
 	case KVM_ENABLE_CAP:
 	{
 		struct kvm_enable_cap cap;
@@ -535,6 +537,8 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
 	}
 
 out:
+	vcpu_put(vcpu);
+out_nolock:
 	return r;
 }