diff options
| author | Seth Jennings <sjenning@linux.vnet.ibm.com> | 2012-06-25 11:14:36 -0500 |
|---|---|---|
| committer | Simon Shields <keepcalm444@gmail.com> | 2016-06-12 21:19:36 +1000 |
| commit | 125790986c7fef051c65aff2ef71c5ea727073ab (patch) | |
| tree | 41c67d8e2af0ebe702e7d027ff32d4f08b310346 /drivers/staging | |
| parent | d25b478f24b26f313e150daaa7c452f5a0b91792 (diff) | |
| download | kernel_samsung_smdk4412-125790986c7fef051c65aff2ef71c5ea727073ab.tar.gz kernel_samsung_smdk4412-125790986c7fef051c65aff2ef71c5ea727073ab.tar.bz2 kernel_samsung_smdk4412-125790986c7fef051c65aff2ef71c5ea727073ab.zip | |
CHROMIUM: UPSTREAM: staging: zram/zcache: swtich Kconfig dependency from X86 to ZSMALLOC
upstream: commit 6e2361720b9da9ec830d407da058ca1827e62b12
This patch switches zcache and zram dependency to ZSMALLOC
rather than X86. There is no net change since ZSMALLOC
depends on X86, however, this prevent further changes to
these files as zsmalloc dependencies change.
Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
BUG=chromium-os:36829
TEST=compile, verify that zram module is updated and /boot/config is correct
Change-Id: I91f6ed46549fe62a9fe3035063d98beb2f5d966a
Signed-off-by: Luigi Semenzato <semenzato@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/39289
Tested-by: Luigi Semenzato <semenzato@google.com>
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
Commit-Ready: Luigi Semenzato <semenzato@google.com>
Conflicts:
drivers/staging/zcache/Kconfig
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/zcache/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/staging/zram/Kconfig | 5 |
2 files changed, 3 insertions, 9 deletions
diff --git a/drivers/staging/zcache/Kconfig b/drivers/staging/zcache/Kconfig index 575d4bfa2db..4881839be62 100644 --- a/drivers/staging/zcache/Kconfig +++ b/drivers/staging/zcache/Kconfig @@ -1,9 +1,6 @@ config ZCACHE - tristate "Dynamic compression of swap pages and clean pagecache pages" - # X86 dependency is because zsmalloc uses non-portable pte/tlb - # functions - depends on (CLEANCACHE || FRONTSWAP) && CRYPTO=y && X86 - select ZSMALLOC + bool "Dynamic compression of swap pages and clean pagecache pages" + depends on (CLEANCACHE || FRONTSWAP) && CRYPTO=y && ZSMALLOC=y select CRYPTO_LZO default n help diff --git a/drivers/staging/zram/Kconfig b/drivers/staging/zram/Kconfig index 9d11a4cb99b..be5abe8e794 100644 --- a/drivers/staging/zram/Kconfig +++ b/drivers/staging/zram/Kconfig @@ -1,9 +1,6 @@ config ZRAM tristate "Compressed RAM block device support" - # X86 dependency is because zsmalloc uses non-portable pte/tlb - # functions - depends on BLOCK && SYSFS && X86 - select ZSMALLOC + depends on BLOCK && SYSFS && ZSMALLOC select LZO_COMPRESS select LZO_DECOMPRESS default n |