diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-12-08 14:37:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-12-08 14:37:10 +0100 |
| commit | 4f797f56c3786e2c6bc542b3f80e9a599b073976 (patch) | |
| tree | 12f311ac2a06329d58d43437243a9b777c7822f4 /drivers/vhost/vsock.c | |
| parent | c5105d764e0214bcc4c6d40d7ba231d01b2e9dda (diff) | |
| parent | 63de37476ebd1e9bab6a9e17186dc5aa1da9ea99 (diff) | |
| download | linux-stable-4f797f56c3786e2c6bc542b3f80e9a599b073976.tar.gz linux-stable-4f797f56c3786e2c6bc542b3f80e9a599b073976.tar.bz2 linux-stable-4f797f56c3786e2c6bc542b3f80e9a599b073976.zip | |
Merge branch 'linus' into sched/urgent, to pick up the latest before merging new patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/vhost/vsock.c')
| -rw-r--r-- | drivers/vhost/vsock.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index dde392b91bb3..50de0642dea6 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -810,23 +810,13 @@ static long vhost_vsock_dev_ioctl(struct file *f, unsigned int ioctl, } } -#ifdef CONFIG_COMPAT -static long vhost_vsock_dev_compat_ioctl(struct file *f, unsigned int ioctl, - unsigned long arg) -{ - return vhost_vsock_dev_ioctl(f, ioctl, (unsigned long)compat_ptr(arg)); -} -#endif - static const struct file_operations vhost_vsock_fops = { .owner = THIS_MODULE, .open = vhost_vsock_dev_open, .release = vhost_vsock_dev_release, .llseek = noop_llseek, .unlocked_ioctl = vhost_vsock_dev_ioctl, -#ifdef CONFIG_COMPAT - .compat_ioctl = vhost_vsock_dev_compat_ioctl, -#endif + .compat_ioctl = compat_ptr_ioctl, }; static struct miscdevice vhost_vsock_misc = { |