Merge remote-tracking branch 'lsk/v3.10/topic/arm64-dma' into lsk-v3.10-arm64-misc

Conflicts:
	arch/arm64/Kconfig
	arch/arm64/mm/dma-mapping.c
	mm/Kconfig

diff --cc arch/arm64/Kconfig
index 1eded479dfd785ff975f76363cb7a2a2a7200025,e418519ec9046b5eb5ed0cdd737252c39f37d6f9..21201a0cb3f7c82fd90d3c55c31d24b52ade3354
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -28,7 -21,7 +28,8 @@@ config ARM6
        select HAVE_DEBUG_KMEMLEAK
        select HAVE_DMA_API_DEBUG
        select HAVE_DMA_ATTRS
+       select HAVE_DMA_CONTIGUOUS
 +      select HAVE_EFFICIENT_UNALIGNED_ACCESS
        select HAVE_GENERIC_DMA_COHERENT
        select HAVE_GENERIC_HARDIRQS
        select HAVE_HW_BREAKPOINT if PERF_EVENTS

diff --cc arch/arm64/include/asm/cacheflush.h
Simple merge

diff --cc arch/arm64/kernel/setup.c
Simple merge

diff --cc arch/arm64/mm/cache.S
Simple merge

diff --cc arch/arm64/mm/init.c
Simple merge

diff --cc mm/Kconfig
index 19b2bd2f6a611cf2208dbf08c8386b31b36ff316,26a5f815cfc38a0a20d9a1e742045929181c34fc..b2d1aed56439f98b74fedb9b3e81c9cedb947b1e
--- 1/mm/Kconfig
--- 2/mm/Kconfig
+++ b/mm/Kconfig
@@@ -478,5 -478,26 +478,29 @@@ config FRONTSWA
  
          If unsure, say Y to enable frontswap.
  
 +config GENERIC_EARLY_IOREMAP
 +      bool
++
+ config CMA
+       bool "Contiguous Memory Allocator"
+       depends on HAVE_MEMBLOCK
+       select MIGRATION
+       select MEMORY_ISOLATION
+       help
+         This enables the Contiguous Memory Allocator which allows other
+         subsystems to allocate big physically-contiguous blocks of memory.
+         CMA reserves a region of memory and allows only movable pages to
+         be allocated from it. This way, the kernel can use the memory for
+         pagecache and when a subsystem requests for contiguous area, the
+         allocated pages are migrated away to serve the contiguous request.
+ 
+         If unsure, say "n".
+ 
+ config CMA_DEBUG
+       bool "CMA debug messages (DEVELOPMENT)"
+       depends on DEBUG_KERNEL && CMA
+       help
+         Turns on debug messages in CMA.  This produces KERN_DEBUG
+         messages for every CMA call as well as various messages while
+         processing calls such as dma_alloc_from_contiguous().
+         This option does not affect warning and error messages.