diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2012-10-09 15:08:10 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-16 21:02:31 -0700 |
| commit | c6c8807630f086872b446cc66752a1835df5e9d7 (patch) | |
| tree | d026d7bb3c51ce7c68e8026d07f48af3bcb95c07 | |
| parent | f0776cdd7c35a4b4ca7b80e6afc4ecd0d26831d7 (diff) | |
| download | linux-stable-c6c8807630f086872b446cc66752a1835df5e9d7.tar.gz linux-stable-c6c8807630f086872b446cc66752a1835df5e9d7.tar.bz2 linux-stable-c6c8807630f086872b446cc66752a1835df5e9d7.zip | |
mtd: Disable mtdchar mmap on MMU systems
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>
| -rw-r--r-- | drivers/mtd/mtdchar.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c index 2434e9d685df..9892dcc8fc01 100644 --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c @@ -1103,7 +1103,11 @@ static int mtd_mmap(struct file *file, struct vm_area_struct *vma) 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); |