Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Conflicts:
	drivers/mtd/mtd_blkdevs.c

Merge Grant's device-tree bits so that we can apply the subsequent fixes.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

1 files changed, 8 insertions, 7 deletions

diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index b7ed09c57903..3eff1e562ad3 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -26,7 +26,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/backing-dev.h>
 #include <linux/compat.h>
 #include <linux/mount.h>
@@ -38,6 +38,7 @@
 #include <asm/uaccess.h>
 
 #define MTD_INODE_FS_MAGIC 0x11307854
+static DEFINE_MUTEX(mtd_mutex);
 static struct vfsmount *mtd_inode_mnt __read_mostly;
 
 /*
@@ -91,7 +92,7 @@ static int mtd_open(struct inode *inode, struct file *file)
         if ((file->f_mode & FMODE_WRITE) && (minor & 1))
                 return -EACCES;
 
-        lock_kernel();
+        mutex_lock(&mtd_mutex);
         mtd = get_mtd_device(NULL, devnum);
 
         if (IS_ERR(mtd)) {
@@ -139,7 +140,7 @@ static int mtd_open(struct inode *inode, struct file *file)
         file->private_data = mfi;
 
 out:
-        unlock_kernel();
+        mutex_unlock(&mtd_mutex);
         return ret;
 } /* mtd_open */
 
@@ -967,9 +968,9 @@ static long mtd_unlocked_ioctl(struct file *file, u_int cmd, u_long arg)
 {
         int ret;
 
-        lock_kernel();
+        mutex_lock(&mtd_mutex);
         ret = mtd_ioctl(file, cmd, arg);
-        unlock_kernel();
+        mutex_unlock(&mtd_mutex);
 
         return ret;
 }
@@ -993,7 +994,7 @@ static long mtd_compat_ioctl(struct file *file, unsigned int cmd,
         void __user *argp = compat_ptr(arg);
         int ret = 0;
 
-        lock_kernel();
+        mutex_lock(&mtd_mutex);
 
         switch (cmd) {
         case MEMWRITEOOB32:
@@ -1028,7 +1029,7 @@ static long mtd_compat_ioctl(struct file *file, unsigned int cmd,
                 ret = mtd_ioctl(file, cmd, (unsigned long)argp);
         }
 
-        unlock_kernel();
+        mutex_unlock(&mtd_mutex);
 
         return ret;
 }