X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fiface-host-dev.c;h=cfcf4c09b1e101997fafcfa68e93aa3b46fe649d;hb=3a4199e3954eafb0f2ef886ca3a24a9cee391a43;hp=a1e69c478b18964f33367f4aa9dd6b8c81e92d7d;hpb=3eb79d116ea7c6f48c1575a2b6b58372d0db4eaa;p=palacios.git diff --git a/linux_module/iface-host-dev.c b/linux_module/iface-host-dev.c index a1e69c4..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,19 +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, -#else - .ioctl = host_dev_ioctl, -#endif + .compat_ioctl = host_dev_ioctl, + .unlocked_ioctl = host_dev_ioctl, };