[Xen-devel] [PATCH] PV-on-HVM: xenbus - check HAVE_UNLOCKED_IOCTL for old Linux kernels.

["KUWAMURA Shin'ya" <kuwa@xxxxxxxxxxxxxx>]

Hi,

Building PV-on-HVM drivers for RHEL4U2 failed:
  
/ia64/xen-unstable.hg/unmodified_drivers/linux-2.6/platform-pci/../xenbus/xenbus_dev.c:446:
 error: unknown field `unlocked_ioctl' specified in initializer

This patch fixes it.

Best regards,
-- 
  KUWAMURA Shin'ya

# HG changeset patch
# User KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>
# Date 1242894400 -32400
# Node ID c4e22b5f3302e1403c0173b6236207ccf4669a34
# Parent  bd7e30b58d125a64fc8388022a24f598068b95ec
PV-on-HVM: xenbus - check HAVE_UNLOCKED_IOCTL for old Linux kernels.

Signed-off-by: KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>

diff -r bd7e30b58d12 -r c4e22b5f3302 drivers/xen/xenbus/xenbus_dev.c
--- a/drivers/xen/xenbus/xenbus_dev.c   Tue May 19 14:45:50 2009 +0100
+++ b/drivers/xen/xenbus/xenbus_dev.c   Thu May 21 17:26:40 2009 +0900
@@ -387,6 +387,7 @@ static unsigned int xenbus_dev_poll(stru
        return 0;
 }
 
+#ifdef HAVE_UNLOCKED_IOCTL
 static long xenbus_dev_ioctl(struct file *file,
                              unsigned int cmd, unsigned long data)
 {
@@ -436,6 +437,7 @@ static long xenbus_dev_ioctl(struct file
 
        return ret;
 }
+#endif
 
 static const struct file_operations xenbus_dev_file_ops = {
        .read = xenbus_dev_read,
@@ -443,7 +445,9 @@ static const struct file_operations xenb
        .open = xenbus_dev_open,
        .release = xenbus_dev_release,
        .poll = xenbus_dev_poll,
+#ifdef HAVE_UNLOCKED_IOCTL
        .unlocked_ioctl = xenbus_dev_ioctl
+#endif
 };
 
 int xenbus_dev_init(void)

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel