diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-10 13:42:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-10 13:42:33 +0200 |
| commit | 2d41d2ab85d414f6ea9eac2f853b1aa31ba0820f (patch) | |
| tree | 2b56ba6dc8bfa65535fc2e70ed61f40a1cbefe15 /drivers/virt/vboxguest/vboxguest_linux.c | |
| parent | 415abcdfd4b8326d679cd0c78bee00b5ceac9718 (diff) | |
| parent | 59d1d2e8e1e7c50d2657d5e4812b53f71f507968 (diff) | |
| download | lwn-2d41d2ab85d414f6ea9eac2f853b1aa31ba0820f.tar.gz lwn-2d41d2ab85d414f6ea9eac2f853b1aa31ba0820f.zip | |
Merge branch 'char-misc-linus' into 'char-misc-next'
We need the virtbox changes in here as well to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/virt/vboxguest/vboxguest_linux.c')
| -rw-r--r-- | drivers/virt/vboxguest/vboxguest_linux.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/virt/vboxguest/vboxguest_linux.c b/drivers/virt/vboxguest/vboxguest_linux.c index 6e8c0f1c1056..32c2c52f7e84 100644 --- a/drivers/virt/vboxguest/vboxguest_linux.c +++ b/drivers/virt/vboxguest/vboxguest_linux.c @@ -131,7 +131,8 @@ static long vbg_misc_device_ioctl(struct file *filp, unsigned int req, * the need for a bounce-buffer and another copy later on. */ is_vmmdev_req = (req & ~IOCSIZE_MASK) == VBG_IOCTL_VMMDEV_REQUEST(0) || - req == VBG_IOCTL_VMMDEV_REQUEST_BIG; + req == VBG_IOCTL_VMMDEV_REQUEST_BIG || + req == VBG_IOCTL_VMMDEV_REQUEST_BIG_ALT; if (is_vmmdev_req) buf = vbg_req_alloc(size, VBG_IOCTL_HDR_TYPE_DEFAULT, |