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>

diff --git a/drivers/staging/zcache/Kconfig b/drivers/staging/zcache/Kconfig
index 7048e01f081714bf506c1c4f83f6e6740faacb7b..4881839be6258f83743469cb2e63c2e86fd4c9e7 100644 (file)
--- a/drivers/staging/zcache/Kconfig
+++ b/drivers/staging/zcache/Kconfig
@@ -1,9 +1,6 @@
 config ZCACHE
        bool "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
+       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 9d11a4cb99b74198fb129a82bcacf55036b66dd0..be5abe8e7943af5a6238ef868218906557e15807 100644 (file)
--- 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