Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build

Manual fixup of:

	arch/powerpc/Kconfig

6 files changed, 43 insertions, 25 deletions

diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index 4a79b187b568..5c29872184e6 100644
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -130,10 +130,6 @@ typedef struct partition_t {
     u_int16_t           DataUnits;
     u_int32_t           BlocksPerUnit;
     erase_unit_header_t header;
-#if 0
-    region_info_t       region;
-    memory_handle_t     handle;
-#endif
 } partition_t;
 
 /* Partition state flags */
diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c
index c12d8056bebd..68eec6c6c517 100644
--- a/drivers/mtd/maps/omap_nor.c
+++ b/drivers/mtd/maps/omap_nor.c
@@ -60,13 +60,22 @@ struct omapflash_info {
 static void omap_set_vpp(struct map_info *map, int enable)
 {
         static int      count;
-
-        if (enable) {
-                if (count++ == 0)
-                        OMAP_EMIFS_CONFIG_REG |= OMAP_EMIFS_CONFIG_WP;
-        } else {
-                if (count && (--count == 0))
-                        OMAP_EMIFS_CONFIG_REG &= ~OMAP_EMIFS_CONFIG_WP;
+        u32 l;
+
+        if (cpu_class_is_omap1()) {
+                if (enable) {
+                        if (count++ == 0) {
+                                l = omap_readl(EMIFS_CONFIG);
+                                l |= OMAP_EMIFS_CONFIG_WP;
+                                omap_writel(l, EMIFS_CONFIG);
+                        }
+                } else {
+                        if (count && (--count == 0)) {
+                                l = omap_readl(EMIFS_CONFIG);
+                                l &= ~OMAP_EMIFS_CONFIG_WP;
+                                omap_writel(l, EMIFS_CONFIG);
+                        }
+                }
         }
 }
 
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index 1912d968718b..0cc31675aeb9 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -498,17 +498,14 @@ static int pcmciamtd_config(struct pcmcia_device *link)
         int i;
         config_info_t t;
         static char *probes[] = { "jedec_probe", "cfi_probe" };
-        cisinfo_t cisinfo;
         int new_name = 0;
 
         DEBUG(3, "link=0x%p", link);
 
         DEBUG(2, "Validating CIS");
-        ret = pcmcia_validate_cis(link, &cisinfo);
+        ret = pcmcia_validate_cis(link, NULL);
         if(ret != CS_SUCCESS) {
                 cs_error(link, GetTupleData, ret);
-        } else {
-                DEBUG(2, "ValidateCIS found %d chains", cisinfo.Chains);
         }
 
         card_settings(dev, link, &new_name);
@@ -563,9 +560,7 @@ static int pcmciamtd_config(struct pcmcia_device *link)
         DEBUG(1, "Allocated a window of %dKiB", dev->win_size >> 10);
 
         /* Get write protect status */
-        CS_CHECK(GetStatus, pcmcia_get_status(link, &status));
-        DEBUG(2, "status value: 0x%x window handle = 0x%8.8lx",
-              status.CardState, (unsigned long)link->win);
+        DEBUG(2, "window handle = 0x%8.8lx", (unsigned long)link->win);
         dev->win_base = ioremap(req.Base, req.Size);
         if(!dev->win_base) {
                 err("ioremap(%lu, %u) failed", req.Base, req.Size);
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 5d3ac512ce16..129d429cd2da 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
+#include <linux/smp_lock.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/compatmac.h>
@@ -86,6 +87,7 @@ static int mtd_open(struct inode *inode, struct file *file)
 {
         int minor = iminor(inode);
         int devnum = minor >> 1;
+        int ret = 0;
         struct mtd_info *mtd;
         struct mtd_file_info *mfi;
 
@@ -98,31 +100,39 @@ static int mtd_open(struct inode *inode, struct file *file)
         if ((file->f_mode & 2) && (minor & 1))
                 return -EACCES;
 
+        lock_kernel();
         mtd = get_mtd_device(NULL, devnum);
 
-        if (IS_ERR(mtd))
-                return PTR_ERR(mtd);
+        if (IS_ERR(mtd)) {
+                ret = PTR_ERR(mtd);
+                goto out;
+        }
 
         if (MTD_ABSENT == mtd->type) {
                 put_mtd_device(mtd);
-                return -ENODEV;
+                ret = -ENODEV;
+                goto out;
         }
 
         /* You can't open it RW if it's not a writeable device */
         if ((file->f_mode & 2) && !(mtd->flags & MTD_WRITEABLE)) {
                 put_mtd_device(mtd);
-                return -EACCES;
+                ret = -EACCES;
+                goto out;
         }
 
         mfi = kzalloc(sizeof(*mfi), GFP_KERNEL);
         if (!mfi) {
                 put_mtd_device(mtd);
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto out;
         }
         mfi->mtd = mtd;
         file->private_data = mfi;
 
-        return 0;
+out:
+        unlock_kernel();
+        return ret;
 } /* mtd_open */
 
 /*====================================================================*/
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
index 59e05a1c50cf..ee2ac3948cd8 100644
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@ -85,6 +85,9 @@ static int __init orion_nand_probe(struct platform_device *pdev)
         nc->cmd_ctrl = orion_nand_cmd_ctrl;
         nc->ecc.mode = NAND_ECC_SOFT;
 
+        if (board->chip_delay)
+                nc->chip_delay = board->chip_delay;
+
         if (board->width == 16)
                 nc->options |= NAND_BUSWIDTH_16;
 
diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c
index 9d6aae5449b6..89193ba9451e 100644
--- a/drivers/mtd/ubi/cdev.c
+++ b/drivers/mtd/ubi/cdev.c
@@ -39,6 +39,7 @@
 #include <linux/stat.h>
 #include <linux/ioctl.h>
 #include <linux/capability.h>
+#include <linux/smp_lock.h>
 #include <mtd/ubi-user.h>
 #include <asm/uaccess.h>
 #include <asm/div64.h>
@@ -103,9 +104,12 @@ static int vol_cdev_open(struct inode *inode, struct file *file)
         struct ubi_volume_desc *desc;
         int vol_id = iminor(inode) - 1, mode, ubi_num;
 
+        lock_kernel();
         ubi_num = ubi_major2num(imajor(inode));
-        if (ubi_num < 0)
+        if (ubi_num < 0) {
+                unlock_kernel();
                 return ubi_num;
+        }
 
         if (file->f_mode & FMODE_WRITE)
                 mode = UBI_READWRITE;
@@ -115,6 +119,7 @@ static int vol_cdev_open(struct inode *inode, struct file *file)
         dbg_msg("open volume %d, mode %d", vol_id, mode);
 
         desc = ubi_open_volume(ubi_num, vol_id, mode);
+        unlock_kernel();
         if (IS_ERR(desc))
                 return PTR_ERR(desc);