diff options
author | Seth Jennings <sjenning@linux.vnet.ibm.com> | 2012-02-13 08:47:49 -0600 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-13 06:57:17 -0800 |
commit | 0cbb613fa82fb09b6ef914ab0aaa92091f367bb6 (patch) | |
tree | ae789540ad753c373e48fd42dafc7b046198ccf4 /drivers/staging/zram | |
parent | b91867f2ee5c84b550f95ce54c91b180f70f48cb (diff) | |
download | talos-op-linux-0cbb613fa82fb09b6ef914ab0aaa92091f367bb6.tar.gz talos-op-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/zram')
-rw-r--r-- | drivers/staging/zram/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/zram/Kconfig b/drivers/staging/zram/Kconfig index ee23a86ea7d5..9d11a4cb99b7 100644 --- a/drivers/staging/zram/Kconfig +++ b/drivers/staging/zram/Kconfig @@ -1,6 +1,8 @@ config ZRAM tristate "Compressed RAM block device support" - depends on BLOCK && SYSFS + # X86 dependency is because zsmalloc uses non-portable pte/tlb + # functions + depends on BLOCK && SYSFS && X86 select ZSMALLOC select LZO_COMPRESS select LZO_DECOMPRESS |