X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fiface-host-dev.c;h=cfcf4c09b1e101997fafcfa68e93aa3b46fe649d;hb=fd1de839d257d3ed2f0a8f27d231432b166b2cc1;hp=22070dad33ecd1b844e0d50d2c39e3c5d42de126;hpb=f0d84b1fde4ae3f2e72de0de94610fd8f2f79975;p=palacios.git diff --git a/linux_module/iface-host-dev.c b/linux_module/iface-host-dev.c index 22070da..cfcf4c0 100644 --- a/linux_module/iface-host-dev.c +++ b/linux_module/iface-host-dev.c @@ -342,7 +342,7 @@ static int host_dev_release(struct inode * i, struct file * filp) return 0; } -static int host_dev_ioctl(struct inode *ip, struct file *fp, unsigned int val, unsigned long arg) +static long host_dev_ioctl(struct file * fp, unsigned int val, unsigned long arg) { void __user *argp = (void __user *)arg; @@ -595,18 +595,11 @@ static int host_dev_ioctl(struct inode *ip, struct file *fp, unsigned int val, u } -static long host_dev_compat_ioctl(struct file * filp, unsigned int ioctl, unsigned long arg) -{ - return host_dev_ioctl(NULL, filp, ioctl, arg); -} - static struct file_operations host_dev_fops = { .poll = host_dev_poll, .release = host_dev_release, -#ifdef HAVE_COMPAT_IOCTL - .compat_ioctl = host_dev_compat_ioctl, -#endif - .ioctl = host_dev_ioctl, + .compat_ioctl = host_dev_ioctl, + .unlocked_ioctl = host_dev_ioctl, };