2.6.16 is out (was: [openib-general] iser 2.6.16 update)

[Roland Dreier]

I just checked the following patch, which removes the rest of the
pre-2.6.16 compatibility hacks.

Just to be clear: the svn trunk is now targeted at 2.6.16, the current
stable kernel.  Using an older kernel with the svn trunk may break in
surprising ways.

 - R.

--- infiniband/ulp/ipoib/ipoib.h	(revision 5937)
+++ infiniband/ulp/ipoib/ipoib.h	(working copy)
@@ -45,14 +45,10 @@
 #include <linux/config.h>
 #include <linux/kref.h>
 #include <linux/if_infiniband.h>
-/* XXX remove this compatibility hack when 2.6.16 is released */
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
-#include <linux/mutex-backport.h>
-#else
 #include <linux/mutex.h>
-#endif /* XXX end of hack */
+
+/* XXX remove when 2.6.17 is released */
+#include <linux/version.h>
 
 #include <net/neighbour.h>
 
--- infiniband/ulp/srp/ib_srp.h	(revision 5937)
+++ infiniband/ulp/srp/ib_srp.h	(working copy)
@@ -38,14 +38,7 @@
 #include <linux/types.h>
 #include <linux/list.h>
 #include <linux/scatterlist.h>
-/* XXX remove this compatibility hack when 2.6.16 is released */
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
-#include <linux/mutex-backport.h>
-#else
 #include <linux/mutex.h>
-#endif /* XXX end of hack */
 
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_cmnd.h>
--- infiniband/core/addr.c	(revision 5937)
+++ infiniband/core/addr.c	(working copy)
@@ -28,14 +28,7 @@
  * and/or other materials provided with the distribution.
  */
 
-/* XXX remove this compatibility hack when 2.6.16 is released */
-#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
-#include <linux/mutex-backport.h>
-#else
 #include <linux/mutex.h>
-#endif /* XXX end of hack */
-
 #include <linux/inetdevice.h>
 #include <linux/workqueue.h>
 #include <linux/if_arp.h>
--- infiniband/core/local_sa.c	(revision 5937)
+++ infiniband/core/local_sa.c	(working copy)
@@ -34,13 +34,7 @@
 #include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/index.h>
-/* XXX : fixme when 2.6.16 released */
-#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
-#include <linux/mutex-backport.h>
-#else
 #include <linux/mutex.h>
-#endif
 #include <linux/pci.h>
 
 #include <rdma/ib_addr.h>
--- infiniband/core/device.c	(revision 5937)
+++ infiniband/core/device.c	(working copy)
@@ -38,16 +38,7 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/init.h>
-
-/* XXX remove this compatibility hack when 2.6.16 is released */
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
-#include <linux/mutex-backport.h>
-#else
 #include <linux/mutex.h>
-#endif /* XXX end of hack */
-
 
 #include "core_priv.h"
 
--- infiniband/core/sysfs.c	(revision 5937)
+++ infiniband/core/sysfs.c	(working copy)
@@ -41,13 +41,6 @@
 
 #include <rdma/ib_mad.h>
 
-/* XXX remove this compatibility hack when 2.6.16 is released */
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
-#define add_uevent_var add_hotplug_env_var
-#endif /* XXX end of hack */
-
 struct ib_port {
 	struct kobject         kobj;
 	struct ib_device      *ibdev;
@@ -682,12 +675,7 @@ static struct class_device_attribute *ib
 static struct class ib_class = {
 	.name    = "infiniband",
 	.release = ib_device_release,
-/* XXX remove this compatibility hack when 2.6.16 is released */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
-	.hotplug = ib_device_uevent,
-#else
 	.uevent  = ib_device_uevent,
-#endif /* XXX end of hack */
 };
 
 int ib_device_register_sysfs(struct ib_device *device)
--- infiniband/core/uverbs.h	(revision 5937)
+++ infiniband/core/uverbs.h	(working copy)
@@ -41,14 +41,7 @@
 
 #include <linux/kref.h>
 #include <linux/idr.h>
-/* XXX remove this compatibility hack when 2.6.16 is released */
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
-#include <linux/mutex-backport.h>
-#else
 #include <linux/mutex.h>
-#endif /* XXX end of hack */
 
 #include <rdma/ib_verbs.h>
 #include <rdma/ib_user_verbs.h>
--- infiniband/core/ucm.c	(revision 5937)
+++ infiniband/core/ucm.c	(working copy)
@@ -42,14 +42,7 @@
 #include <linux/mount.h>
 #include <linux/cdev.h>
 #include <linux/idr.h>
-/* XXX remove this compatibility hack when 2.6.16 is released */
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
-#include <linux/mutex-backport.h>
-#else
 #include <linux/mutex.h>
-#endif /* XXX end of hack */
 
 #include <asm/uaccess.h>
 
--- infiniband/core/ucma.c	(revision 5937)
+++ infiniband/core/ucma.c	(working copy)
@@ -30,14 +30,7 @@
  * SOFTWARE.
  */
 
-/* XXX remove this compatibility hack when 2.6.16 is released */
-#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
-#include <linux/mutex-backport.h>
-#else
 #include <linux/mutex.h>
-#endif /* XXX end of hack */
-
 #include <linux/poll.h>
 #include <linux/idr.h>
 #include <linux/in.h>
--- infiniband/hw/mthca/mthca_dev.h	(revision 5937)
+++ infiniband/hw/mthca/mthca_dev.h	(working copy)
@@ -44,14 +44,7 @@
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/timer.h>
-/* XXX remove this compatibility hack when 2.6.16 is released */
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
-#include <linux/mutex-backport.h>
-#else
 #include <linux/mutex.h>
-#endif /* XXX end of hack */
 
 #include <asm/semaphore.h>
 
--- infiniband/hw/mthca/mthca_memfree.h	(revision 5937)
+++ infiniband/hw/mthca/mthca_memfree.h	(working copy)
@@ -39,14 +39,7 @@
 
 #include <linux/list.h>
 #include <linux/pci.h>
-/* XXX remove this compatibility hack when 2.6.16 is released */
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
-#include <linux/mutex-backport.h>
-#else
 #include <linux/mutex.h>
-#endif /* XXX end of hack */
 
 #define MTHCA_ICM_CHUNK_LEN \
 	((256 - sizeof (struct list_head) - 2 * sizeof (int)) /		\