X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fiface-keyed-stream.c;h=a622eb01866d7b451173628d4c3eca7392e8f56d;hb=0420bb147eda8d91eee4e79cf8face8f5a9651bf;hp=ae83ec16e6f1bfa22feeaba0457b93fbf516b762;hpb=f0d84b1fde4ae3f2e72de0de94610fd8f2f79975;p=palacios.git

diff --git a/linux_module/iface-keyed-stream.c b/linux_module/iface-keyed-stream.c
index ae83ec1..a622eb0 100644
--- a/linux_module/iface-keyed-stream.c
+++ b/linux_module/iface-keyed-stream.c
@@ -876,7 +876,7 @@ static unsigned int keyed_stream_poll_user(struct file *filp, poll_table *wait)
     return 0;
 }
 
-static int keyed_stream_ioctl_user(struct inode *inode, struct file *filp, unsigned int ioctl, unsigned long arg)
+static long keyed_stream_ioctl_user(struct file * filp, unsigned int ioctl, unsigned long arg)
 {
     void __user *argp = (void __user *)arg;
     unsigned long flags;
@@ -985,10 +985,6 @@ static int keyed_stream_ioctl_user(struct inode *inode, struct file *filp, unsig
     }
 }
 
-static long keyed_stream_compat_ioctl_user(struct file * filp, unsigned int ioctl, unsigned long arg)
-{
-	return keyed_stream_ioctl_user(NULL, filp, ioctl, arg);
-}
 
 static int keyed_stream_release_user(struct inode *inode, struct file *filp)
 {
@@ -1011,10 +1007,8 @@ static int keyed_stream_release_user(struct inode *inode, struct file *filp)
 
 static struct file_operations user_keyed_stream_fops = {
     .poll = keyed_stream_poll_user,
-#ifdef HAVE_COMPAT_IOCTL
-    .compat_ioctl = keyed_stream_compat_ioctl_user,
-#endif
-    .ioctl = keyed_stream_ioctl_user,
+    .compat_ioctl = keyed_stream_ioctl_user,
+    .unlocked_ioctl = keyed_stream_ioctl_user,
     .release = keyed_stream_release_user,
 };