ia64/linux-2.6.18-xen.hg

changeset 877:f3a935eb30e0

PV-on-HVM: xenbus - check HAVE_UNLOCKED_IOCTL for old Linux kernels.

Signed-off-by: KUWAMURA Shin'ya <kuwa@jp.fujitsu.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue May 26 09:53:55 2009 +0100 (2009-05-26)
parents bd7e30b58d12
children eba6fe6d8d53
files drivers/xen/xenbus/xenbus_dev.c
line diff
     1.1 --- a/drivers/xen/xenbus/xenbus_dev.c	Tue May 19 14:45:50 2009 +0100
     1.2 +++ b/drivers/xen/xenbus/xenbus_dev.c	Tue May 26 09:53:55 2009 +0100
     1.3 @@ -387,6 +387,7 @@ static unsigned int xenbus_dev_poll(stru
     1.4  	return 0;
     1.5  }
     1.6  
     1.7 +#ifdef HAVE_UNLOCKED_IOCTL
     1.8  static long xenbus_dev_ioctl(struct file *file,
     1.9                               unsigned int cmd, unsigned long data)
    1.10  {
    1.11 @@ -436,6 +437,7 @@ static long xenbus_dev_ioctl(struct file
    1.12  
    1.13  	return ret;
    1.14  }
    1.15 +#endif
    1.16  
    1.17  static const struct file_operations xenbus_dev_file_ops = {
    1.18  	.read = xenbus_dev_read,
    1.19 @@ -443,7 +445,9 @@ static const struct file_operations xenb
    1.20  	.open = xenbus_dev_open,
    1.21  	.release = xenbus_dev_release,
    1.22  	.poll = xenbus_dev_poll,
    1.23 +#ifdef HAVE_UNLOCKED_IOCTL
    1.24  	.unlocked_ioctl = xenbus_dev_ioctl
    1.25 +#endif
    1.26  };
    1.27  
    1.28  int xenbus_dev_init(void)