From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Jul 2012 17:11:31 +0000 (-0700)
Subject: Merge branch 'for-linus-for-3.6-rc1' of git://git.linaro.org/people/mszyprowski/linux... 
X-Git-Tag: v3.6-rc1~57
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=6f51f51582e793ea13e7de7ed6b138f71c51784b;p=linux.git

Merge branch 'for-linus-for-3.6-rc1' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

Pull DMA-mapping updates from Marek Szyprowski:
 "Those patches are continuation of my earlier work.

  They contains extensions to DMA-mapping framework to remove limitation
  of the current ARM implementation (like limited total size of DMA
  coherent/write combine buffers), improve performance of buffer sharing
  between devices (attributes to skip cpu cache operations or creation
  of additional kernel mapping for some specific use cases) as well as
  some unification of the common code for dma_mmap_attrs() and
  dma_mmap_coherent() functions.  All extensions have been implemented
  and tested for ARM architecture."

* 'for-linus-for-3.6-rc1' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  ARM: dma-mapping: add support for DMA_ATTR_SKIP_CPU_SYNC attribute
  common: DMA-mapping: add DMA_ATTR_SKIP_CPU_SYNC attribute
  ARM: dma-mapping: add support for dma_get_sgtable()
  common: dma-mapping: introduce dma_get_sgtable() function
  ARM: dma-mapping: add support for DMA_ATTR_NO_KERNEL_MAPPING attribute
  common: DMA-mapping: add DMA_ATTR_NO_KERNEL_MAPPING attribute
  common: dma-mapping: add support for generic dma_mmap_* calls
  ARM: dma-mapping: fix error path for memory allocation failure
  ARM: dma-mapping: add more sanity checks in arm_dma_mmap()
  ARM: dma-mapping: remove custom consistent dma region
  mm: vmalloc: use const void * for caller argument
  scatterlist: add sg_alloc_table_from_pages function
---

6f51f51582e793ea13e7de7ed6b138f71c51784b
diff --cc arch/arm/mm/dma-mapping.c
index 5cfc98994076,b30ba0a1fca3..c2cdf6500f75
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@@ -22,8 -22,8 +22,9 @@@
  #include <linux/memblock.h>
  #include <linux/slab.h>
  #include <linux/iommu.h>
+ #include <linux/io.h>
  #include <linux/vmalloc.h>
 +#include <linux/sizes.h>
  
  #include <asm/memory.h>
  #include <asm/highmem.h>