Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304649
b: refs/heads/master
c: 49b81a3
h: refs/heads/master
i:
  304647: e5f81b2
v: v3
  • Loading branch information
Dan Magenheimer authored and Greg Kroah-Hartman committed May 14, 2012
1 parent 2a5d44d commit 9368b97
Show file tree
Hide file tree
Showing 8 changed files with 200 additions and 736 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c15974ef1f2d858795f7f63280fb53bcab6064f9
refs/heads/master: 49b81a3c7415d9b02169f37b8559d468fd17686a
6 changes: 3 additions & 3 deletions trunk/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 && !XVMALLOC && !HIGHMEM && NET
select LZO_COMPRESS
select LZO_DECOMPRESS
depends on (CLEANCACHE || FRONTSWAP) && CONFIGFS_FS=y && !ZCACHE && CRYPTO=y && !HIGHMEM && NET
select ZSMALLOC
select CRYPTO_LZO
default n
help
RAMster allows RAM on other machines in a cluster to be utilized
Expand Down
2 changes: 1 addition & 1 deletion trunk/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 xvmalloc.o cluster/
obj-$(CONFIG_RAMSTER) += zcache-main.o tmem.o r2net.o cluster/
4 changes: 1 addition & 3 deletions trunk/drivers/staging/ramster/TODO
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
For this staging driver, RAMster duplicates code from drivers/staging/zcache
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.
then incorporates changes to the local copy of the code.
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 9368b97

Please sign in to comment.