Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cbb613f authored by Seth Jennings's avatar Seth Jennings Committed by Greg Kroah-Hartman
Browse files

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: default avatarSeth Jennings <sjenning@linux.vnet.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b91867f2

drivers/staging/zcache/Kconfig

+3 −1
Original line number Original line Diff line number Diff line 
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

drivers/staging/zram/Kconfig

+3 −1
Original line number Original line Diff line number Diff line 
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

drivers/staging/zsmalloc/Kconfig

+4 −1
Original line number Original line Diff line number Diff line 
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

drivers/staging/zsmalloc/zsmalloc-main.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -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"