From: Peter Dinda <pdinda@northwestern.edu>
Date: Fri, 17 Feb 2012 17:34:10 +0000 (-0600)
Subject: Clean up compat ioctl handlers in host-dev and keyed-stream host ifaces
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=f0d84b1fde4ae3f2e72de0de94610fd8f2f79975;p=palacios.git

Clean up compat ioctl handlers in host-dev and keyed-stream host ifaces
---

diff --git a/linux_module/iface-host-dev.c b/linux_module/iface-host-dev.c
index a1e69c4..22070da 100644
--- a/linux_module/iface-host-dev.c
+++ b/linux_module/iface-host-dev.c
@@ -605,9 +605,8 @@ static struct file_operations host_dev_fops = {
     .release  = host_dev_release,
 #ifdef HAVE_COMPAT_IOCTL
     .compat_ioctl = host_dev_compat_ioctl,
-#else
-    .ioctl = host_dev_ioctl,
 #endif
+    .ioctl = host_dev_ioctl,
 };
 
 
diff --git a/linux_module/iface-keyed-stream.c b/linux_module/iface-keyed-stream.c
index bb19e70..ae83ec1 100644
--- a/linux_module/iface-keyed-stream.c
+++ b/linux_module/iface-keyed-stream.c
@@ -1013,9 +1013,8 @@ static struct file_operations user_keyed_stream_fops = {
     .poll = keyed_stream_poll_user,
 #ifdef HAVE_COMPAT_IOCTL
     .compat_ioctl = keyed_stream_compat_ioctl_user,
-#else
-    .ioctl = keyed_stream_ioctl_user,
 #endif
+    .ioctl = keyed_stream_ioctl_user,
     .release = keyed_stream_release_user,
 };