config changes
Revert "zram: promote zram from staging"

This reverts commit 909b6993deee9d73660eef7157928a97a2748171.

Conflicts:
	drivers/block/Kconfig
remove zram fro a restart
drivers/staging/zram: backport zram from 3.7 kernel

All commits up to:
  zram: Fix deadlock bug in partial read/write

Conflicts:
	drivers/staging/Makefile
	drivers/staging/zram/Kconfig
	drivers/staging/zram/Makefile
	drivers/staging/zram/zram_drv.c
	drivers/staging/zram/zram_drv.h
	drivers/staging/zram/zram_sysfs.c
drivers/staging/zram: adapt to 3.0 kernel
staging: zram: add Crypto API support

Date    Tue, 30 Jul 2013 14:30:48 +0200

Current version of zram does not allow any substitution of a default
compression algorithm. Therefore, I decided to change the existing
implementation of page compression by adding Crypto API compability.

All direct calls to lzo1x compression/decompression methods are now
replaced by calls consistent with Crypto. Also, I removed "workmem"
field from struct zram_meta, as it was there for lzo1x purposes only
and is no longer needed. Finally, I added a set of functions required
by Crypto API to work properly.

In order to substitute the default algorithm (lzo), change the value
of zram.compressor module parameter to a proper name (e.g. lz4).

Signed-off-by: Piotr Sarna <p.sarna@partner.samsung.com>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

backported to Linux 3.0 by faux123

Signed-off-by: Paul Reioux <reioux@gmail.com>

boype: removed 'select CRYPTO_LZO' from /drivers/staging/zram/Kconfig

Conflicts:
	drivers/staging/zram/zram_drv.c
staging: zram: add per-cpu support to Crypto

Date	Tue, 30 Jul 2013 14:30:49 +0200

Since original zram code did not implement any per-cpu operations,
my previous patch (staging: zram: add Crypto API support) did not
include them either.

This patch complements the first one with per-cpu support for Crypto,
allocating tfms buffer separately for each online processor.
Changes are based on zswap and zcache per-cpu code.

Basic tests (concurrent writing several 10-40MB chunks to zram) performed
on an ARM-based EXYNOS4412 Quad-Core showed that per-cpu code provides
noticeable time saving, ranging between 30-40% for LZO and LZ4 compressors.
Sample data (LZO): writing 160MB, 40MB per thread took 0.60s with per-cpu
code included and approximately 0.80s without per-cpu support.

Signed-off-by: Piotr Sarna <p.sarna@partner.samsung.com>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

backported to Linux 3.4 by faux123
Signed-off-by: Paul Reioux <reioux@gmail.com>

Conflicts:
	drivers/staging/zram/zram_drv.c
drivers/staging/zram: change compressor from lzo to lz4
config dump
zram: optimize memory operations with clear_page()/copy_page()

Some architectures provides architecture-specific, optimized version of
clear_page()/copy_page(), which may have better performance than
memset()/memcpy(). So use clear_page()/copy_page() to optimize zram
performance if possible.

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Adapt zram to zsmalloc from kernel 3.11
remove frontswap to be re-added
remove mor eof frontswap
Frontswap from kernel 3.8
frontswap backend mechanism from 3.9
Update frontswap to Linux kernel 3.11
build frontswap
Adapt to backported frontswap mechanism