3.4-stable patches

added patches:
	mtd-disable-mtdchar-mmap-on-mmu-systems.patch

diff --git a/queue-3.4/mtd-disable-mtdchar-mmap-on-mmu-systems.patch b/queue-3.4/mtd-disable-mtdchar-mmap-on-mmu-systems.patch
new file mode 100644 (file)
index 0000000..cd6a230
--- /dev/null
+++ b/queue-3.4/mtd-disable-mtdchar-mmap-on-mmu-systems.patch
@@ -0,0 +1,34 @@
+From f5cf8f07423b2677cebebcebc863af77223a4972 Mon Sep 17 00:00:00 2001
+From: David Woodhouse <David.Woodhouse@intel.com>
+Date: Tue, 9 Oct 2012 15:08:10 +0100
+Subject: mtd: Disable mtdchar mmap on MMU systems
+
+From: David Woodhouse <David.Woodhouse@intel.com>
+
+commit f5cf8f07423b2677cebebcebc863af77223a4972 upstream.
+
+This code was broken because it assumed that all MTD devices were map-based.
+Disable it for now, until it can be fixed properly for the next merge window.
+
+Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/mtd/mtdchar.c |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/drivers/mtd/mtdchar.c
++++ b/drivers/mtd/mtdchar.c
+@@ -1162,7 +1162,11 @@ static int mtdchar_mmap(struct file *fil
+       resource_size_t start, off;
+       unsigned long len, vma_len;
+ 
+-      if (mtd->type == MTD_RAM || mtd->type == MTD_ROM) {
++        /* This is broken because it assumes the MTD device is map-based
++         and that mtd->priv is a valid struct map_info.  It should be
++         replaced with something that uses the mtd_get_unmapped_area()
++         operation properly. */
++      if (0 /*mtd->type == MTD_RAM || mtd->type == MTD_ROM*/) {
+               off = get_vm_offset(vma);
+               start = map->phys;
+               len = PAGE_ALIGN((start & ~PAGE_MASK) + map->size);

diff --git a/queue-3.4/series b/queue-3.4/series
index 7dd340658357efaf975245756d3bc9796b1d0189..4073f1849beb4f3076778fc65713df93c70dfdba 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -15,3 +15,4 @@ x86-mm-patch-out-arch_flush_lazy_mmu_mode-when-running-on-bare-metal.patch
 mtdchar-fix-offset-overflow-detection.patch
 kobject-fix-kset_find_obj-race-with-concurrent-last-kobject_put.patch
 r8169-fix-auto-speed-down-issue.patch
+mtd-disable-mtdchar-mmap-on-mmu-systems.patch