diff --git a/[refs] b/[refs] index 76287c024ddf..7eb880c4366c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d196e343361c229496adeda42335856da9d057de +refs/heads/master: adb1ff46754a87f3f6c9e7ee0a92f9a8a183bb38 diff --git a/trunk/virt/kvm/kvm_main.c b/trunk/virt/kvm/kvm_main.c index 121e65cccc58..7972e3aa2cae 100644 --- a/trunk/virt/kvm/kvm_main.c +++ b/trunk/virt/kvm/kvm_main.c @@ -1061,7 +1061,10 @@ static long kvm_dev_ioctl(struct file *filp, r = -EINVAL; if (arg) goto out; - r = 2 * PAGE_SIZE; + r = PAGE_SIZE; /* struct kvm_run */ +#ifdef CONFIG_X86 + r += PAGE_SIZE; /* pio data page */ +#endif break; default: return kvm_arch_dev_ioctl(filp, ioctl, arg);