From: David Woodhouse <David.Woodhouse@intel.com>
Date: Mon, 10 May 2010 13:32:46 +0000 (+0100)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0ae28a35bcb7984838acbf28bfba9c030f8b74f0;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:
	drivers/mtd/mtdcore.c

Pull in the bdi fixes and ARM platform changes that other outstanding
patches depend on.
---

0ae28a35bcb7984838acbf28bfba9c030f8b74f0
diff --cc drivers/mtd/mtdcore.c
index 70a78587c3c0,b177e750efc3..3ae06c8935b5
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@@ -17,12 -19,39 +19,40 @@@
  #include <linux/init.h>
  #include <linux/mtd/compatmac.h>
  #include <linux/proc_fs.h>
 +#include <linux/idr.h>
+ #include <linux/backing-dev.h>
  
  #include <linux/mtd/mtd.h>
- #include "internal.h"
  
  #include "mtdcore.h"
+ /*
+  * backing device capabilities for non-mappable devices (such as NAND flash)
+  * - permits private mappings, copies are taken of the data
+  */
+ struct backing_dev_info mtd_bdi_unmappable = {
+ 	.capabilities	= BDI_CAP_MAP_COPY,
+ };
+ 
+ /*
+  * backing device capabilities for R/O mappable devices (such as ROM)
+  * - permits private mappings, copies are taken of the data
+  * - permits non-writable shared mappings
+  */
+ struct backing_dev_info mtd_bdi_ro_mappable = {
+ 	.capabilities	= (BDI_CAP_MAP_COPY | BDI_CAP_MAP_DIRECT |
+ 			   BDI_CAP_EXEC_MAP | BDI_CAP_READ_MAP),
+ };
+ 
+ /*
+  * backing device capabilities for writable mappable devices (such as RAM)
+  * - permits private mappings, copies are taken of the data
+  * - permits non-writable shared mappings
+  */
+ struct backing_dev_info mtd_bdi_rw_mappable = {
+ 	.capabilities	= (BDI_CAP_MAP_COPY | BDI_CAP_MAP_DIRECT |
+ 			   BDI_CAP_EXEC_MAP | BDI_CAP_READ_MAP |
+ 			   BDI_CAP_WRITE_MAP),
+ };
  
  static int mtd_cls_suspend(struct device *dev, pm_message_t state);
  static int mtd_cls_resume(struct device *dev);