[Xen-changelog] [linux-2.6.18-xen] PV-on-HVM: xenbus - check HAVE_UNLOCKED_IOCTL for old Linux kernels.

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1243328035 -3600
# Node ID f3a935eb30e0f6f1e42f7055e9cd32837fd34eac
# Parent  bd7e30b58d125a64fc8388022a24f598068b95ec
PV-on-HVM: xenbus - check HAVE_UNLOCKED_IOCTL for old Linux kernels.

Signed-off-by: KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>
---
 drivers/xen/xenbus/xenbus_dev.c |    4 ++++
 1 files changed, 4 insertions(+)

diff -r bd7e30b58d12 -r f3a935eb30e0 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   Tue May 26 09:53:55 2009 +0100
@@ -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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog