From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Mon, 15 Jul 2013 09:13:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next
X-Git-Tag: firefly_0821_release~176^2~5372^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f7d8f1e9cb44e6ee1602586dbf7f2bed637a2b4e;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next

Conflicts:
	mm/Kconfig

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---

f7d8f1e9cb44e6ee1602586dbf7f2bed637a2b4e
diff --cc mm/Kconfig
index 8028dcc6615c,26a5f815cfc3..256bfd0f6007
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@@ -478,44 -478,26 +478,68 @@@ config FRONTSWA
  
  	  If unsure, say Y to enable frontswap.
  
 +config ZBUD
 +	tristate
 +	default n
 +	help
 +	  A special purpose allocator for storing compressed pages.
 +	  It is designed to store up to two compressed pages per physical
 +	  page.  While this design limits storage density, it has simple and
 +	  deterministic reclaim properties that make it preferable to a higher
 +	  density approach when reclaim will be used.
 +
 +config ZSWAP
 +	bool "Compressed cache for swap pages (EXPERIMENTAL)"
 +	depends on FRONTSWAP && CRYPTO=y
 +	select CRYPTO_LZO
 +	select ZBUD
 +	default n
 +	help
 +	  A lightweight compressed cache for swap pages.  It takes
 +	  pages that are in the process of being swapped out and attempts to
 +	  compress them into a dynamically allocated RAM-based memory pool.
 +	  This can result in a significant I/O reduction on swap device and,
 +	  in the case where decompressing from RAM is faster that swap device
 +	  reads, can also improve workload performance.
 +
 +	  This is marked experimental because it is a new feature (as of
 +	  v3.11) that interacts heavily with memory reclaim.  While these
 +	  interactions don't cause any known issues on simple memory setups,
 +	  they have not be fully explored on the large set of potential
 +	  configurations and workloads that exist.
 +
 +config MEM_SOFT_DIRTY
 +	bool "Track memory changes"
 +	depends on CHECKPOINT_RESTORE && HAVE_ARCH_SOFT_DIRTY
 +	select PROC_PAGE_MONITOR
 +	help
 +	  This option enables memory changes tracking by introducing a
 +	  soft-dirty bit on pte-s. This bit it set when someone writes
 +	  into a page just as regular dirty bit, but unlike the latter
 +	  it can be cleared by hands.
 +
 +	  See Documentation/vm/soft-dirty.txt for more details.
++
+ 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.