diff options
| author | Seth Jennings | 2012-02-13 15:47:49 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-02-13 15:57:17 +0100 |
| commit | 0cbb613fa82fb09b6ef914ab0aaa92091f367bb6 (patch) | |
| tree | ae789540ad753c373e48fd42dafc7b046198ccf4 /drivers/staging/zcache | |
| parent | Merge tag 'staging-3.3-rc3' into staging-next (diff) | |
| download | kernel-qcow2-linux-0cbb613fa82fb09b6ef914ab0aaa92091f367bb6.tar.gz kernel-qcow2-linux-0cbb613fa82fb09b6ef914ab0aaa92091f367bb6.tar.xz kernel-qcow2-linux-0cbb613fa82fb09b6ef914ab0aaa92091f367bb6.zip | |
staging: fix powerpc linux-next break on zsmalloc
linux/vmalloc.h added to zsmalloc-main.c to resolve implicit
declaration errors.
X86 dependency added to zsmalloc and dependent drivers zcache and zram.
This X86 only requirement is not ideal. Working to find portable
functions for __flush_tlb_one and set_pte.
Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/zcache')
| -rw-r--r-- | drivers/staging/zcache/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/zcache/Kconfig b/drivers/staging/zcache/Kconfig index 94e48aa9f36b..5a36fcfd87c0 100644 --- a/drivers/staging/zcache/Kconfig +++ b/drivers/staging/zcache/Kconfig @@ -1,6 +1,8 @@ config ZCACHE tristate "Dynamic compression of swap pages and clean pagecache pages" - depends on (CLEANCACHE || FRONTSWAP) && CRYPTO + # X86 dependency is because zsmalloc uses non-portable pte/tlb + # functions + depends on (CLEANCACHE || FRONTSWAP) && CRYPTO && X86 select ZSMALLOC select CRYPTO_LZO default n |