Staging: Rename ramzswap files to zram
Related changes: - Modify revelant Kconfig and Makefile accordingly. - Change include filenames in code. - Remove dependency on CONFIG_SWAP in Kconfig as zram usage is no longer limited to swap disks. Signed-off-by: Nitin Gupta <ngupta@vflare.org> Acked-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
a1dd52afa9
commit
16a4bfb9e9
|
@ -119,7 +119,7 @@ source "drivers/staging/sep/Kconfig"
|
||||||
|
|
||||||
source "drivers/staging/iio/Kconfig"
|
source "drivers/staging/iio/Kconfig"
|
||||||
|
|
||||||
source "drivers/staging/ramzswap/Kconfig"
|
source "drivers/staging/zram/Kconfig"
|
||||||
|
|
||||||
source "drivers/staging/wlags49_h2/Kconfig"
|
source "drivers/staging/wlags49_h2/Kconfig"
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ obj-$(CONFIG_RAR_REGISTER) += rar_register/
|
||||||
obj-$(CONFIG_MRST_RAR_HANDLER) += memrar/
|
obj-$(CONFIG_MRST_RAR_HANDLER) += memrar/
|
||||||
obj-$(CONFIG_DX_SEP) += sep/
|
obj-$(CONFIG_DX_SEP) += sep/
|
||||||
obj-$(CONFIG_IIO) += iio/
|
obj-$(CONFIG_IIO) += iio/
|
||||||
obj-$(CONFIG_RAMZSWAP) += ramzswap/
|
obj-$(CONFIG_ZRAM) += zram/
|
||||||
obj-$(CONFIG_WLAGS49_H2) += wlags49_h2/
|
obj-$(CONFIG_WLAGS49_H2) += wlags49_h2/
|
||||||
obj-$(CONFIG_WLAGS49_H25) += wlags49_h25/
|
obj-$(CONFIG_WLAGS49_H25) += wlags49_h25/
|
||||||
obj-$(CONFIG_BATMAN_ADV) += batman-adv/
|
obj-$(CONFIG_BATMAN_ADV) += batman-adv/
|
||||||
|
|
|
@ -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.
|
|
|
@ -1,3 +0,0 @@
|
||||||
ramzswap-objs := ramzswap_drv.o xvmalloc.o
|
|
||||||
|
|
||||||
obj-$(CONFIG_RAMZSWAP) += ramzswap.o
|
|
|
@ -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.
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
zram-objs := zram_drv.o xvmalloc.o
|
||||||
|
|
||||||
|
obj-$(CONFIG_ZRAM) += zram.o
|
|
@ -30,7 +30,7 @@
|
||||||
#include <linux/swapops.h>
|
#include <linux/swapops.h>
|
||||||
#include <linux/vmalloc.h>
|
#include <linux/vmalloc.h>
|
||||||
|
|
||||||
#include "ramzswap_drv.h"
|
#include "zram_drv.h"
|
||||||
|
|
||||||
/* Globals */
|
/* Globals */
|
||||||
static int ramzswap_major;
|
static int ramzswap_major;
|
|
@ -18,7 +18,7 @@
|
||||||
#include <linux/spinlock.h>
|
#include <linux/spinlock.h>
|
||||||
#include <linux/mutex.h>
|
#include <linux/mutex.h>
|
||||||
|
|
||||||
#include "ramzswap_ioctl.h"
|
#include "zram_ioctl.h"
|
||||||
#include "xvmalloc.h"
|
#include "xvmalloc.h"
|
||||||
|
|
||||||
/*
|
/*
|
Loading…
Reference in New Issue