From 355aaffdaf82c95a004daedd1ea64fc61a25b8db Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 15 Oct 2007 12:55:20 -0700 Subject: Reinstate lost flush_ioremap_region() fix to pxa2xx-flash driver Commit 90833fdab89da02fc0276224167f0a42e5176f41 ("[ARM] 4554/1: replace consistent_sync() with flush_ioremap_region()") introduced a new "flush_ioremap_region()" function to be used by the MTD mainstone-flash and lubbock-flash drivers to fix a regression from around 2.6.18. Those drivers were independently merged into a single driver by Todd Poynor in commit e644f7d6289456657996df4192de76c5d0a9f9c7 ("[MTD] MAPS: Merge Lubbock and Mainstone drivers into common PXA2xx driver") Later, those two commits were merged into the main MTD tree by commit b160292cc216a50fd0cd386b0bda2cd48352c73b ("Merge Linux 2.6.23") by David Woodhouse, but in that merge, the fix to use flush_iomap_region() got lost (as it was to files that now no longer existed). This reinstates the fix in the new driver. Noticed-by: Russell King Tested-and-acked-by: Nicolas Pitre Cc: David Woodhouse Cc: Jared Hulbert Cc: Todd Poynor Signed-off-by: Linus Torvalds --- drivers/mtd/maps/pxa2xx-flash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c index cb933ac475d..82113295c26 100644 --- a/drivers/mtd/maps/pxa2xx-flash.c +++ b/drivers/mtd/maps/pxa2xx-flash.c @@ -14,20 +14,20 @@ #include #include #include -#include #include #include #include #include #include +#include #include static void pxa2xx_map_inval_cache(struct map_info *map, unsigned long from, ssize_t len) { - consistent_sync((char *)map->cached + from, len, DMA_FROM_DEVICE); + flush_ioremap_region(map->phys, map->cached, from, len); } struct pxa2xx_flash_info { -- cgit v1.2.3