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, 6 insertions, 0 deletions

diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index 77a4f1446156..f2e9de1414df 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -294,6 +294,10 @@ static int omap3_onenand_read_bufferram(struct mtd_info *mtd, int area,
         if (bram_offset & 3 || (size_t)buf & 3 || count < 384)
                 goto out_copy;
 
+        /* panic_write() may be in an interrupt context */
+        if (in_interrupt())
+                goto out_copy;
+
         if (buf >= high_memory) {
                 struct page *p1;
 
@@ -672,6 +676,8 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
         c->mtd.priv = &c->onenand;
         c->mtd.owner = THIS_MODULE;
 
+        c->mtd.dev.parent = &pdev->dev;
+
         if (c->dma_channel >= 0) {
                 struct onenand_chip *this = &c->onenand;