---

yaml --- r: 205622 b: refs/heads/master c: 16a4bfb h: refs/heads/master v: v3
git-mirror · Jun 18, 2010 · c697abd · c697abd
1 parent 9029816
commit c697abd
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 29 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1dd52afa94238d361d70502b219409ea115e235
+refs/heads/master: 16a4bfb9e9dfefbd28ee170fa3e259bc88d81eb5
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
@@ -119,7 +119,7 @@ source "drivers/staging/sep/Kconfig"
 
 source "drivers/staging/iio/Kconfig"
 
-source "drivers/staging/ramzswap/Kconfig"
+source "drivers/staging/zram/Kconfig"
 
 source "drivers/staging/wlags49_h2/Kconfig"
 

diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
@@ -40,7 +40,7 @@ obj-$(CONFIG_RAR_REGISTER)	+= rar_register/
 obj-$(CONFIG_MRST_RAR_HANDLER)	+= memrar/
 obj-$(CONFIG_DX_SEP)		+= sep/
 obj-$(CONFIG_IIO)		+= iio/
-obj-$(CONFIG_RAMZSWAP)		+= ramzswap/
+obj-$(CONFIG_ZRAM)		+= zram/
 obj-$(CONFIG_WLAGS49_H2)	+= wlags49_h2/
 obj-$(CONFIG_WLAGS49_H25)	+= wlags49_h25/
 obj-$(CONFIG_BATMAN_ADV)	+= batman-adv/

diff --git a/trunk/drivers/staging/ramzswap/Kconfig b/trunk/drivers/staging/ramzswap/Kconfig
diff --git a/trunk/drivers/staging/ramzswap/Makefile b/trunk/drivers/staging/ramzswap/Makefile
diff --git a/trunk/drivers/staging/zram/Kconfig b/trunk/drivers/staging/zram/Kconfig
@@ -0,0 +1,28 @@
+config ZRAM
+	tristate "Compressed RAM block device support"
+	select LZO_COMPRESS
+	select LZO_DECOMPRESS
+	default n
+	help
+	  Creates virtual block devices called /dev/zramX (X = 0, 1, ...).
+	  Pages written to these disks are compressed and stored in memory
+	  itself. These disks allow very fast I/O and compression provides
+	  good amounts of memory savings.
+
+	  It has several use cases, for example: /tmp storage, use as swap
+	  disks and maybe many more.
+
+	  See zram.txt for more information.
+	  Project home: http://compcache.googlecode.com/
+
+config ZRAM_STATS
+	bool "Enable statistics for compressed RAM disks"
+	depends on ZRAM
+	default y
+	help
+	  Enable statistics collection for compressed RAM devices. Statistics
+	  are exported through ioctl interface, so you have to use zramconfig
+	  program to get them. This adds only a minimal overhead.
+
+	  If unsure, say Y.
+
diff --git a/trunk/drivers/staging/zram/Makefile b/trunk/drivers/staging/zram/Makefile
@@ -0,0 +1,3 @@
+zram-objs	:=	zram_drv.o xvmalloc.o
+
+obj-$(CONFIG_ZRAM)	+=	zram.o
diff --git a/trunk/drivers/staging/ramzswap/xvmalloc.c → trunk/drivers/staging/zram/xvmalloc.c b/trunk/drivers/staging/ramzswap/xvmalloc.c → trunk/drivers/staging/zram/xvmalloc.c
diff --git a/trunk/drivers/staging/ramzswap/xvmalloc.h → trunk/drivers/staging/zram/xvmalloc.h b/trunk/drivers/staging/ramzswap/xvmalloc.h → trunk/drivers/staging/zram/xvmalloc.h
diff --git a/...k/drivers/staging/ramzswap/xvmalloc_int.h → trunk/drivers/staging/zram/xvmalloc_int.h b/...k/drivers/staging/ramzswap/xvmalloc_int.h → trunk/drivers/staging/zram/xvmalloc_int.h
diff --git a/trunk/drivers/staging/ramzswap/ramzswap.txt → trunk/drivers/staging/zram/zram.txt b/trunk/drivers/staging/ramzswap/ramzswap.txt → trunk/drivers/staging/zram/zram.txt
diff --git a/...k/drivers/staging/ramzswap/ramzswap_drv.c → trunk/drivers/staging/zram/zram_drv.c b/...k/drivers/staging/ramzswap/ramzswap_drv.c → trunk/drivers/staging/zram/zram_drv.c
@@ -30,7 +30,7 @@
 #include <linux/swapops.h>
 #include <linux/vmalloc.h>
 
-#include "ramzswap_drv.h"
+#include "zram_drv.h"
 
 /* Globals */
 static int ramzswap_major;

diff --git a/...k/drivers/staging/ramzswap/ramzswap_drv.h → trunk/drivers/staging/zram/zram_drv.h b/...k/drivers/staging/ramzswap/ramzswap_drv.h → trunk/drivers/staging/zram/zram_drv.h
@@ -18,7 +18,7 @@
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
 
-#include "ramzswap_ioctl.h"
+#include "zram_ioctl.h"
 #include "xvmalloc.h"
 
 /*

diff --git a/...drivers/staging/ramzswap/ramzswap_ioctl.h → trunk/drivers/staging/zram/zram_ioctl.h b/...drivers/staging/ramzswap/ramzswap_ioctl.h → trunk/drivers/staging/zram/zram_ioctl.h
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		zram-objs := zram_drv.o xvmalloc.o

		obj-$(CONFIG_ZRAM) += zram.o