[Xen-changelog] [linux-2.6.18-xen] backends: remove version specific code

[Xen patchbot-linux-2.6.18-xen <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxx>
# Date 1321949832 -3600
# Node ID da0850ab55d66d74a4a304484f9a1933919306bf
# Parent  3c4ee62def8335bc5b9d3333479d9f1f69621b90
backends: remove version specific code

Backends, other than frontends and come parts of core code, aren't
meant to be built against multiple Linux versions (and they wouldn't
really build anyway), so remove the code dealing with this case.

This really is mostly the removal of pointless inclusions of
linux/version.h, but in the case of blktap2 also includes some dead
code elimination.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
---


diff -r 3c4ee62def83 -r da0850ab55d6 drivers/xen/blkback/common.h
--- a/drivers/xen/blkback/common.h      Mon Nov 21 09:33:16 2011 +0100
+++ b/drivers/xen/blkback/common.h      Tue Nov 22 09:17:12 2011 +0100
@@ -27,7 +27,6 @@
 #ifndef __BLKIF__BACKEND__COMMON_H__
 #define __BLKIF__BACKEND__COMMON_H__
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
diff -r 3c4ee62def83 -r da0850ab55d6 drivers/xen/blktap/common.h
--- a/drivers/xen/blktap/common.h       Mon Nov 21 09:33:16 2011 +0100
+++ b/drivers/xen/blktap/common.h       Tue Nov 22 09:17:12 2011 +0100
@@ -27,7 +27,6 @@
 #ifndef __BLKIF__BACKEND__COMMON_H__
 #define __BLKIF__BACKEND__COMMON_H__
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
diff -r 3c4ee62def83 -r da0850ab55d6 drivers/xen/blktap2/device.c
--- a/drivers/xen/blktap2/device.c      Mon Nov 21 09:33:16 2011 +0100
+++ b/drivers/xen/blktap2/device.c      Tue Nov 22 09:17:12 2011 +0100
@@ -93,27 +93,6 @@
                      command, (long)argument, inode->i_rdev);
 
        switch (command) {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
-       case HDIO_GETGEO: {
-               struct block_device *bd = inode->i_bdev;
-               struct hd_geometry geo;
-               int ret;
-
-                if (!argument)
-                        return -EINVAL;
-
-               geo.start = get_start_sect(bd);
-               ret = blktap_device_getgeo(bd, &geo);
-               if (ret)
-                       return ret;
-
-               if (copy_to_user((struct hd_geometry __user *)argument, &geo,
-                                sizeof(geo)))
-                        return -EFAULT;
-
-                return 0;
-       }
-#endif
        case CDROMMULTISESSION:
                BTDBG("FIXME: support multisession CDs later\n");
                for (i = 0; i < sizeof(struct cdrom_multisession); i++)
@@ -146,9 +125,7 @@
        .open      = blktap_device_open,
        .release   = blktap_device_release,
        .ioctl     = blktap_device_ioctl,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
        .getgeo    = blktap_device_getgeo
-#endif
 };
 
 static int
@@ -1135,11 +1112,7 @@
        if (!rq)
                goto error;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
        elevator_init(rq, "noop");
-#else
-       elevator_init(rq, &elevator_noop);
-#endif
 
        gd->queue     = rq;
        rq->queuedata = dev;
diff -r 3c4ee62def83 -r da0850ab55d6 drivers/xen/netback/common.h
--- a/drivers/xen/netback/common.h      Mon Nov 21 09:33:16 2011 +0100
+++ b/drivers/xen/netback/common.h      Tue Nov 22 09:17:12 2011 +0100
@@ -29,7 +29,6 @@
 #ifndef __NETIF__BACKEND__COMMON_H__
 #define __NETIF__BACKEND__COMMON_H__
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
diff -r 3c4ee62def83 -r da0850ab55d6 drivers/xen/pcifront/pci_op.c
--- a/drivers/xen/pcifront/pci_op.c     Mon Nov 21 09:33:16 2011 +0100
+++ b/drivers/xen/pcifront/pci_op.c     Tue Nov 22 09:17:12 2011 +0100
@@ -4,7 +4,6 @@
  *   Author: Ryan Wilson <hap9@xxxxxxxxxxxxxx>
  */
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
diff -r 3c4ee62def83 -r da0850ab55d6 drivers/xen/scsiback/common.h
--- a/drivers/xen/scsiback/common.h     Mon Nov 21 09:33:16 2011 +0100
+++ b/drivers/xen/scsiback/common.h     Tue Nov 22 09:17:12 2011 +0100
@@ -31,7 +31,6 @@
 #ifndef __SCSIIF__BACKEND__COMMON_H__
 #define __SCSIIF__BACKEND__COMMON_H__
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
diff -r 3c4ee62def83 -r da0850ab55d6 drivers/xen/tpmback/common.h
--- a/drivers/xen/tpmback/common.h      Mon Nov 21 09:33:16 2011 +0100
+++ b/drivers/xen/tpmback/common.h      Tue Nov 22 09:17:12 2011 +0100
@@ -5,7 +5,6 @@
 #ifndef __TPM__BACKEND__COMMON_H__
 #define __TPM__BACKEND__COMMON_H__
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/mm.h>

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