Skip to content

Commit

Permalink
Revert "ramster: switch over to zsmalloc and crypto interface"
Browse files Browse the repository at this point in the history
This reverts commit 49b81a3.

It causes build breakage under some configurations.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Greg Kroah-Hartman committed May 16, 2012
1 parent 1894a25 commit 00bf19f
Show file tree
Hide file tree
Showing 7 changed files with 735 additions and 199 deletions.
6 changes: 3 additions & 3 deletions drivers/staging/ramster/Kconfig
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
config RAMSTER
bool "Cross-machine RAM capacity sharing, aka peer-to-peer tmem"
depends on (CLEANCACHE || FRONTSWAP) && CONFIGFS_FS=y && !ZCACHE && CRYPTO=y && !HIGHMEM && NET
select ZSMALLOC
select CRYPTO_LZO
depends on (CLEANCACHE || FRONTSWAP) && CONFIGFS_FS=y && !ZCACHE && !XVMALLOC && !HIGHMEM && NET
select LZO_COMPRESS
select LZO_DECOMPRESS
default n
help
RAMster allows RAM on other machines in a cluster to be utilized
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/ramster/Makefile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
obj-$(CONFIG_RAMSTER) += zcache-main.o tmem.o r2net.o cluster/
obj-$(CONFIG_RAMSTER) += zcache-main.o tmem.o r2net.o xvmalloc.o cluster/
4 changes: 3 additions & 1 deletion drivers/staging/ramster/TODO
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
For this staging driver, RAMster duplicates code from drivers/staging/zcache
then incorporates changes to the local copy of the code.
then incorporates changes to the local copy of the code. For V5, it also
directly incorporates the soon-to-be-removed drivers/staging/zram/xvmalloc.[ch]
as all testing has been done with xvmalloc rather than the new zsmalloc.
Before RAMster can be promoted from staging, the zcache and RAMster drivers
should be either merged or reorganized to separate out common code.

Expand Down
Loading

0 comments on commit 00bf19f

Please sign in to comment.