Skip to content

Commit

Permalink
staging: fix powerpc linux-next break on zsmalloc
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Seth Jennings authored and Greg Kroah-Hartman committed Feb 13, 2012
1 parent b91867f commit 0cbb613
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
4 changes: 3 additions & 1 deletion drivers/staging/zcache/Kconfig
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion drivers/staging/zram/Kconfig
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 4 additions & 1 deletion drivers/staging/zsmalloc/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
config ZSMALLOC
tristate "Memory allocator for compressed pages"
depends on SPARSEMEM
# X86 dependency is because of the use of __flush_tlb_one and set_pte
# in zsmalloc-main.c.
# TODO: convert these to portable functions
depends on SPARSEMEM && X86
default n
help
zsmalloc is a slab-based memory allocator designed to store
Expand Down
1 change: 1 addition & 0 deletions drivers/staging/zsmalloc/zsmalloc-main.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <asm/pgtable.h>
#include <linux/cpumask.h>
#include <linux/cpu.h>
#include <linux/vmalloc.h>

#include "zsmalloc.h"
#include "zsmalloc_int.h"
Expand Down

0 comments on commit 0cbb613

Please sign in to comment.