Commit d651b886 authored by Dan Magenheimer's avatar Dan Magenheimer Committed by Greg Kroah-Hartman
Browse files

staging: zcache: adjustments to config/build files due to renaming 



[V2: no code changes, patchset now generated via git format-patch -M]

In staging/zcache, adjust config/build due to ramster->zcache renaming

Signed-off-by: default avatarDan Magenheimer <dan.magenheimer@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 703ba7fe

drivers/staging/zcache/Kconfig

+6 −11
Original line number Original line Diff line number Diff line 
config ZCACHE2

config ZCACHE

	bool "Dynamic compression of swap pages and clean pagecache pages"

	bool "Dynamic compression of swap pages and clean pagecache pages"

	depends on CRYPTO=y && SWAP=y && CLEANCACHE && FRONTSWAP && !ZCACHE 

	depends on CRYPTO=y && SWAP=y && CLEANCACHE && FRONTSWAP

	select CRYPTO_LZO

	select CRYPTO_LZO

	default n

	default n

	help

	help

	  Zcache2 doubles RAM efficiency while providing a significant

	  Zcache doubles RAM efficiency while providing a significant

	  performance boosts on many workloads.  Zcache2 uses

	  performance boosts on many workloads.  Zcache uses

	  compression and an in-kernel implementation of transcendent

	  compression and an in-kernel implementation of transcendent

	  memory to store clean page cache pages and swap in RAM,

	  memory to store clean page cache pages and swap in RAM,

	  providing a noticeable reduction in disk I/O.  Zcache2

	  providing a noticeable reduction in disk I/O.

	  is a complete rewrite of the older zcache; it was intended to

	  be a merge but that has been blocked due to political and

	  technical disagreements.  It is intended that they will merge

	  again in the future.  Until then, zcache2 is a single-node

	  version of ramster.





config RAMSTER

config RAMSTER

	bool "Cross-machine RAM capacity sharing, aka peer-to-peer tmem"

	bool "Cross-machine RAM capacity sharing, aka peer-to-peer tmem"

	depends on CONFIGFS_FS=y && SYSFS=y && !HIGHMEM && ZCACHE2=y

	depends on CONFIGFS_FS=y && SYSFS=y && !HIGHMEM && ZCACHE=y

	depends on NET

	depends on NET

	# must ensure struct page is 8-byte aligned

	# must ensure struct page is 8-byte aligned

	select HAVE_ALIGNED_STRUCT_PAGE if !64_BIT

	select HAVE_ALIGNED_STRUCT_PAGE if !64_BIT

drivers/staging/zcache/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -3,4 +3,4 @@ zcache-$(CONFIG_RAMSTER) += ramster/ramster.o ramster/r2net.o 
zcache-$(CONFIG_RAMSTER)	+=	ramster/nodemanager.o ramster/tcp.o

zcache-$(CONFIG_RAMSTER)	+=	ramster/nodemanager.o ramster/tcp.o

zcache-$(CONFIG_RAMSTER)	+=	ramster/heartbeat.o ramster/masklog.o

zcache-$(CONFIG_RAMSTER)	+=	ramster/heartbeat.o ramster/masklog.o





obj-$(CONFIG_ZCACHE2)	+=	zcache.o
 
obj-$(CONFIG_ZCACHE)	+=	zcache.o