From: Ian Abbott <abbotti@mev.co.uk>
Date: Fri, 13 May 2011 13:55:19 +0000 (+0100)
Subject: comedi: Removal of <linux/smp_lock.h>
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ee00026c9d5e96fe8e6e8a8551c8258578fc8d7b;p=comedi.git

comedi: Removal of <linux/smp_lock.h>

The <linux/smp_lock.h> header (used for the Big Kernel Lock) is removed
in kernel 2.6.39.  It was included by:

  comedi/comedi_compat32.c
  comedi/drivers/usbdux.c
  comedi/drivers/usbduxfast.c

The usbdux and usbduxfast drivers shouldn't need to include the header
as they don't grab the BKL, so remove the #include line for these
drivers.

The comedi_compat32 code only uses it when calling the ioctl file
operation, and that can only happen for kernels up to 2.6.35 (and even
then it wouldn't be called if the unlocked_ioctl file operation is
available!). Ifdef out the #include line.  Also include
<linux/version.h> explicitly to avoid compiler errors for 2.6.39 kernel.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---

diff --git a/comedi/comedi_compat32.c b/comedi/comedi_compat32.c
index 6156f77d..a579ea7b 100644
--- a/comedi/comedi_compat32.c
+++ b/comedi/comedi_compat32.c
@@ -25,8 +25,11 @@
 */
 
 #define __NO_VERSION__
+#include <linux/version.h>
 #include <linux/comedi.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)
 #include <linux/smp_lock.h>
+#endif
 #include <asm/uaccess.h>
 
 #include "comedi_compat32.h"
diff --git a/comedi/drivers/usbdux.c b/comedi/drivers/usbdux.c
index 8d99c47e..032877a6 100644
--- a/comedi/drivers/usbdux.c
+++ b/comedi/drivers/usbdux.c
@@ -90,7 +90,6 @@ sampling rate. If you sample two channels you get 4kHz and so on.
 #include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/usb.h>
-#include <linux/smp_lock.h>
 #include <linux/fcntl.h>
 #include <linux/compiler.h>
 #include <linux/firmware.h>
diff --git a/comedi/drivers/usbduxfast.c b/comedi/drivers/usbduxfast.c
index b35e654e..a8793501 100644
--- a/comedi/drivers/usbduxfast.c
+++ b/comedi/drivers/usbduxfast.c
@@ -56,7 +56,6 @@ Status: stable
 #include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/usb.h>
-#include <linux/smp_lock.h>
 #include <linux/fcntl.h>
 #include <linux/compiler.h>
 #include "comedi_fc.h"