Merge "zswap: add to mm/"

	  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.

obj-$(CONFIG_BOUNCE)	+= bounce.o

obj-$(CONFIG_SWAP)	+= page_io.o swap_state.o swapfile.o

obj-$(CONFIG_FRONTSWAP)	+= frontswap.o

obj-$(CONFIG_ZSWAP)	+= zswap.o

obj-$(CONFIG_HAS_DMA)	+= dmapool.o

obj-$(CONFIG_HUGETLBFS)	+= hugetlb.o

obj-$(CONFIG_NUMA) 	+= mempolicy.o