Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-01 10:45:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: fix powerpc linux-next break on zsmalloc

Browse Source 
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>
This commit is contained in:
Seth Jennings 2012-02-13 08:47:49 -06:00 committed by Greg Kroah-Hartman
parent b91867f2ee
commit 0cbb613fa8
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/zcache/Kconfig
View File

@ -1,6 +1,8 @@
config ZCACHE config ZCACHE
tristate "Dynamic compression of swap pages and clean pagecache pages" 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 ZSMALLOC
select CRYPTO_LZO select CRYPTO_LZO
default n default n

4
drivers/staging/zram/Kconfig
View File

@ -1,6 +1,8 @@
config ZRAM config ZRAM
tristate "Compressed RAM block device support" 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 ZSMALLOC
select LZO_COMPRESS select LZO_COMPRESS
select LZO_DECOMPRESS select LZO_DECOMPRESS

5
drivers/staging/zsmalloc/Kconfig
View File

@ -1,6 +1,9 @@
config ZSMALLOC config ZSMALLOC
tristate "Memory allocator for compressed pages" 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 default n
help help
zsmalloc is a slab-based memory allocator designed to store zsmalloc is a slab-based memory allocator designed to store

1
drivers/staging/zsmalloc/zsmalloc-main.c
View File

@ -26,6 +26,7 @@
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <linux/cpumask.h> #include <linux/cpumask.h>
#include <linux/cpu.h> #include <linux/cpu.h>
#include <linux/vmalloc.h>
#include "zsmalloc.h" #include "zsmalloc.h"
#include "zsmalloc_int.h" #include "zsmalloc_int.h"