From 40f584ebe03edb99f3a7192b649f060402e921a4 Mon Sep 17 00:00:00 2001
From: Jonathan Corbet <corbet@lwn.net>
Date: Fri, 16 May 2008 13:46:14 -0600
Subject: [PATCH] --- yaml --- r: 100302 b: refs/heads/master c:
 609f9e92b570f390a457a81effe0af6b758dc582 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/spi/spidev.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9751b75f5c41..398f067baa56 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d21c95c569c462da20d491b75d0a45bd70ddc1bf
+refs/heads/master: 609f9e92b570f390a457a81effe0af6b758dc582
diff --git a/trunk/drivers/spi/spidev.c b/trunk/drivers/spi/spidev.c
index b3518ca9f04e..ab2b769c83ca 100644
--- a/trunk/drivers/spi/spidev.c
+++ b/trunk/drivers/spi/spidev.c
@@ -29,6 +29,7 @@
 #include <linux/errno.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 
 #include <linux/spi/spi.h>
 #include <linux/spi/spidev.h>
@@ -393,6 +394,7 @@ static int spidev_open(struct inode *inode, struct file *filp)
 	struct spidev_data	*spidev;
 	int			status = -ENXIO;
 
+	lock_kernel();
 	mutex_lock(&device_list_lock);
 
 	list_for_each_entry(spidev, &device_list, device_entry) {
@@ -418,6 +420,7 @@ static int spidev_open(struct inode *inode, struct file *filp)
 		pr_debug("spidev: nothing for minor %d\n", iminor(inode));
 
 	mutex_unlock(&device_list_lock);
+	unlock_kernel();
 	return status;
 }