Merge branch 'linus' into perfcounters/core

Merge reason: need the upstream facility added by:

  7f1e2ca: hrtimer: fix rq->lock inversion (again)

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 14 insertions, 2 deletions

diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c
index 1a6b3beabe8d..1060337c06df 100644
--- a/drivers/mtd/mtdoops.c
+++ b/drivers/mtd/mtdoops.c
@@ -44,6 +44,7 @@ static struct mtdoops_context {
         int oops_pages;
         int nextpage;
         int nextcount;
+        char *name;
 
         void *oops_buf;
 
@@ -273,6 +274,9 @@ static void mtdoops_notify_add(struct mtd_info *mtd)
 {
         struct mtdoops_context *cxt = &oops_cxt;
 
+        if (cxt->name && !strcmp(mtd->name, cxt->name))
+                cxt->mtd_index = mtd->index;
+
         if ((mtd->index != cxt->mtd_index) || cxt->mtd_index < 0)
                 return;
 
@@ -357,8 +361,10 @@ mtdoops_console_write(struct console *co, const char *s, unsigned int count)
         spin_lock_irqsave(&cxt->writecount_lock, flags);
 
         /* Check ready status didn't change whilst waiting for the lock */
-        if (!cxt->ready)
+        if (!cxt->ready) {
+                spin_unlock_irqrestore(&cxt->writecount_lock, flags);
                 return;
+        }
 
         if (cxt->writecount == 0) {
                 u32 *stamp = cxt->oops_buf;
@@ -383,8 +389,12 @@ static int __init mtdoops_console_setup(struct console *co, char *options)
 {
         struct mtdoops_context *cxt = co->data;
 
-        if (cxt->mtd_index != -1)
+        if (cxt->mtd_index != -1 || cxt->name)
                 return -EBUSY;
+        if (options) {
+                cxt->name = kstrdup(options, GFP_KERNEL);
+                return 0;
+        }
         if (co->index == -1)
                 return -EINVAL;
 
@@ -412,6 +422,7 @@ static int __init mtdoops_console_init(void)
 
         cxt->mtd_index = -1;
         cxt->oops_buf = vmalloc(OOPS_PAGE_SIZE);
+        spin_lock_init(&cxt->writecount_lock);
 
         if (!cxt->oops_buf) {
                 printk(KERN_ERR "Failed to allocate mtdoops buffer workspace\n");
@@ -432,6 +443,7 @@ static void __exit mtdoops_console_exit(void)
 
         unregister_mtd_user(&mtdoops_notifier);
         unregister_console(&mtdoops_console);
+        kfree(cxt->name);
         vfree(cxt->oops_buf);
 }