diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2013-05-09 11:56:40 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-05-09 11:56:40 -0400 |
| commit | 5e0e61dd2c89c673f89fb57dcd3cc746dc0c1706 (patch) | |
| tree | 5ebe6156cbc8620625b736a5c9f4d3f47e6d9ebc /virt | |
| parent | 9b3539e0e545e4c2f338acfc1ce52033a6f5e7f7 (diff) | |
| parent | 50c8308538dc9671490d6cb65259ef0ed79f5d13 (diff) | |
Merge branch 'next/kvm' into mips-for-linux-next
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/kvm_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index f18013f09e68..1fc942048521 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
| @@ -1981,7 +1981,7 @@ static long kvm_vcpu_ioctl(struct file *filp, | |||
| 1981 | if (vcpu->kvm->mm != current->mm) | 1981 | if (vcpu->kvm->mm != current->mm) |
| 1982 | return -EIO; | 1982 | return -EIO; |
| 1983 | 1983 | ||
| 1984 | #if defined(CONFIG_S390) || defined(CONFIG_PPC) | 1984 | #if defined(CONFIG_S390) || defined(CONFIG_PPC) || defined(CONFIG_MIPS) |
| 1985 | /* | 1985 | /* |
| 1986 | * Special cases: vcpu ioctls that are asynchronous to vcpu execution, | 1986 | * Special cases: vcpu ioctls that are asynchronous to vcpu execution, |
| 1987 | * so vcpu_load() would break it. | 1987 | * so vcpu_load() would break it. |