Merge branch 'next/kvm' into mips-for-linux-next

This commit is contained in:
Ralf Baechle
2013-05-09 17:56:40 +02:00
42 changed files with 7412 additions and 18 deletions

View File

@@ -1981,7 +1981,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.