From c697abd73c0a155137c7115bbf029db07cfeac6e Mon Sep 17 00:00:00 2001 From: Nitin Gupta Date: Tue, 1 Jun 2010 13:31:24 +0530 Subject: [PATCH] --- yaml --- r: 205622 b: refs/heads/master c: 16a4bfb9e9dfefbd28ee170fa3e259bc88d81eb5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/Kconfig | 2 +- trunk/drivers/staging/Makefile | 2 +- trunk/drivers/staging/ramzswap/Kconfig | 21 -------------- trunk/drivers/staging/ramzswap/Makefile | 3 -- trunk/drivers/staging/zram/Kconfig | 28 +++++++++++++++++++ trunk/drivers/staging/zram/Makefile | 3 ++ .../staging/{ramzswap => zram}/xvmalloc.c | 0 .../staging/{ramzswap => zram}/xvmalloc.h | 0 .../staging/{ramzswap => zram}/xvmalloc_int.h | 0 .../{ramzswap/ramzswap.txt => zram/zram.txt} | 0 .../ramzswap_drv.c => zram/zram_drv.c} | 2 +- .../ramzswap_drv.h => zram/zram_drv.h} | 2 +- .../ramzswap_ioctl.h => zram/zram_ioctl.h} | 0 14 files changed, 36 insertions(+), 29 deletions(-) delete mode 100644 trunk/drivers/staging/ramzswap/Kconfig delete mode 100644 trunk/drivers/staging/ramzswap/Makefile create mode 100644 trunk/drivers/staging/zram/Kconfig create mode 100644 trunk/drivers/staging/zram/Makefile rename trunk/drivers/staging/{ramzswap => zram}/xvmalloc.c (100%) rename trunk/drivers/staging/{ramzswap => zram}/xvmalloc.h (100%) rename trunk/drivers/staging/{ramzswap => zram}/xvmalloc_int.h (100%) rename trunk/drivers/staging/{ramzswap/ramzswap.txt => zram/zram.txt} (100%) rename trunk/drivers/staging/{ramzswap/ramzswap_drv.c => zram/zram_drv.c} (99%) rename trunk/drivers/staging/{ramzswap/ramzswap_drv.h => zram/zram_drv.h} (99%) rename trunk/drivers/staging/{ramzswap/ramzswap_ioctl.h => zram/zram_ioctl.h} (100%) diff --git a/[refs] b/[refs] index 2a98151e8676..aa471a6daa54 100644 --- 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 index d5b827ccecf8..cdd3ea348319 100644 --- 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 index 2c14f89387be..beceaff3dfdf 100644 --- 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 deleted file mode 100644 index 127b3c6c9596..000000000000 --- a/trunk/drivers/staging/ramzswap/Kconfig +++ /dev/null @@ -1,21 +0,0 @@ -config RAMZSWAP - tristate "Compressed in-memory swap device (ramzswap)" - depends on SWAP - select LZO_COMPRESS - select LZO_DECOMPRESS - default n - help - Creates virtual block devices which can (only) be used as swap - disks. Pages swapped to these disks are compressed and stored in - memory itself. - - See ramzswap.txt for more information. - Project home: http://compcache.googlecode.com/ - -config RAMZSWAP_STATS - bool "Enable ramzswap stats" - depends on RAMZSWAP - default y - help - Enable statistics collection for ramzswap. This adds only a minimal - overhead. In unsure, say Y. diff --git a/trunk/drivers/staging/ramzswap/Makefile b/trunk/drivers/staging/ramzswap/Makefile deleted file mode 100644 index 507d7dc3b864..000000000000 --- a/trunk/drivers/staging/ramzswap/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -ramzswap-objs := ramzswap_drv.o xvmalloc.o - -obj-$(CONFIG_RAMZSWAP) += ramzswap.o diff --git a/trunk/drivers/staging/zram/Kconfig b/trunk/drivers/staging/zram/Kconfig new file mode 100644 index 000000000000..5bcfe16feb19 --- /dev/null +++ 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 new file mode 100644 index 000000000000..b2c087aa105e --- /dev/null +++ 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 b/trunk/drivers/staging/zram/xvmalloc.c similarity index 100% rename from trunk/drivers/staging/ramzswap/xvmalloc.c rename to trunk/drivers/staging/zram/xvmalloc.c diff --git a/trunk/drivers/staging/ramzswap/xvmalloc.h b/trunk/drivers/staging/zram/xvmalloc.h similarity index 100% rename from trunk/drivers/staging/ramzswap/xvmalloc.h rename to trunk/drivers/staging/zram/xvmalloc.h diff --git a/trunk/drivers/staging/ramzswap/xvmalloc_int.h b/trunk/drivers/staging/zram/xvmalloc_int.h similarity index 100% rename from trunk/drivers/staging/ramzswap/xvmalloc_int.h rename to trunk/drivers/staging/zram/xvmalloc_int.h diff --git a/trunk/drivers/staging/ramzswap/ramzswap.txt b/trunk/drivers/staging/zram/zram.txt similarity index 100% rename from trunk/drivers/staging/ramzswap/ramzswap.txt rename to trunk/drivers/staging/zram/zram.txt diff --git a/trunk/drivers/staging/ramzswap/ramzswap_drv.c b/trunk/drivers/staging/zram/zram_drv.c similarity index 99% rename from trunk/drivers/staging/ramzswap/ramzswap_drv.c rename to trunk/drivers/staging/zram/zram_drv.c index 7b5cc61b3d69..e9b064c21484 100644 --- a/trunk/drivers/staging/ramzswap/ramzswap_drv.c +++ b/trunk/drivers/staging/zram/zram_drv.c @@ -30,7 +30,7 @@ #include #include -#include "ramzswap_drv.h" +#include "zram_drv.h" /* Globals */ static int ramzswap_major; diff --git a/trunk/drivers/staging/ramzswap/ramzswap_drv.h b/trunk/drivers/staging/zram/zram_drv.h similarity index 99% rename from trunk/drivers/staging/ramzswap/ramzswap_drv.h rename to trunk/drivers/staging/zram/zram_drv.h index ad91726013bb..4d2e48a23474 100644 --- a/trunk/drivers/staging/ramzswap/ramzswap_drv.h +++ b/trunk/drivers/staging/zram/zram_drv.h @@ -18,7 +18,7 @@ #include #include -#include "ramzswap_ioctl.h" +#include "zram_ioctl.h" #include "xvmalloc.h" /* diff --git a/trunk/drivers/staging/ramzswap/ramzswap_ioctl.h b/trunk/drivers/staging/zram/zram_ioctl.h similarity index 100% rename from trunk/drivers/staging/ramzswap/ramzswap_ioctl.h rename to trunk/drivers/staging/zram/zram_ioctl.h