diff options
-rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/Makefile | 2 | ||||
-rw-r--r-- | drivers/staging/ramzswap/Kconfig | 21 | ||||
-rw-r--r-- | drivers/staging/ramzswap/Makefile | 3 | ||||
-rw-r--r-- | drivers/staging/zram/Kconfig | 28 | ||||
-rw-r--r-- | drivers/staging/zram/Makefile | 3 | ||||
-rw-r--r-- | drivers/staging/zram/xvmalloc.c (renamed from drivers/staging/ramzswap/xvmalloc.c) | 0 | ||||
-rw-r--r-- | drivers/staging/zram/xvmalloc.h (renamed from drivers/staging/ramzswap/xvmalloc.h) | 0 | ||||
-rw-r--r-- | drivers/staging/zram/xvmalloc_int.h (renamed from drivers/staging/ramzswap/xvmalloc_int.h) | 0 | ||||
-rw-r--r-- | drivers/staging/zram/zram.txt (renamed from drivers/staging/ramzswap/ramzswap.txt) | 0 | ||||
-rw-r--r-- | drivers/staging/zram/zram_drv.c (renamed from drivers/staging/ramzswap/ramzswap_drv.c) | 2 | ||||
-rw-r--r-- | drivers/staging/zram/zram_drv.h (renamed from drivers/staging/ramzswap/ramzswap_drv.h) | 2 | ||||
-rw-r--r-- | drivers/staging/zram/zram_ioctl.h (renamed from drivers/staging/ramzswap/ramzswap_ioctl.h) | 0 |
13 files changed, 35 insertions, 28 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index d5b827ccecf..cdd3ea34831 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig | |||
@@ -119,7 +119,7 @@ source "drivers/staging/sep/Kconfig" | |||
119 | 119 | ||
120 | source "drivers/staging/iio/Kconfig" | 120 | source "drivers/staging/iio/Kconfig" |
121 | 121 | ||
122 | source "drivers/staging/ramzswap/Kconfig" | 122 | source "drivers/staging/zram/Kconfig" |
123 | 123 | ||
124 | source "drivers/staging/wlags49_h2/Kconfig" | 124 | source "drivers/staging/wlags49_h2/Kconfig" |
125 | 125 | ||
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 2c14f89387b..beceaff3dfd 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile | |||
@@ -40,7 +40,7 @@ obj-$(CONFIG_RAR_REGISTER) += rar_register/ | |||
40 | obj-$(CONFIG_MRST_RAR_HANDLER) += memrar/ | 40 | obj-$(CONFIG_MRST_RAR_HANDLER) += memrar/ |
41 | obj-$(CONFIG_DX_SEP) += sep/ | 41 | obj-$(CONFIG_DX_SEP) += sep/ |
42 | obj-$(CONFIG_IIO) += iio/ | 42 | obj-$(CONFIG_IIO) += iio/ |
43 | obj-$(CONFIG_RAMZSWAP) += ramzswap/ | 43 | obj-$(CONFIG_ZRAM) += zram/ |
44 | obj-$(CONFIG_WLAGS49_H2) += wlags49_h2/ | 44 | obj-$(CONFIG_WLAGS49_H2) += wlags49_h2/ |
45 | obj-$(CONFIG_WLAGS49_H25) += wlags49_h25/ | 45 | obj-$(CONFIG_WLAGS49_H25) += wlags49_h25/ |
46 | obj-$(CONFIG_BATMAN_ADV) += batman-adv/ | 46 | obj-$(CONFIG_BATMAN_ADV) += batman-adv/ |
diff --git a/drivers/staging/ramzswap/Kconfig b/drivers/staging/ramzswap/Kconfig deleted file mode 100644 index 127b3c6c959..00000000000 --- a/drivers/staging/ramzswap/Kconfig +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | config RAMZSWAP | ||
2 | tristate "Compressed in-memory swap device (ramzswap)" | ||
3 | depends on SWAP | ||
4 | select LZO_COMPRESS | ||
5 | select LZO_DECOMPRESS | ||
6 | default n | ||
7 | help | ||
8 | Creates virtual block devices which can (only) be used as swap | ||
9 | disks. Pages swapped to these disks are compressed and stored in | ||
10 | memory itself. | ||
11 | |||
12 | See ramzswap.txt for more information. | ||
13 | Project home: http://compcache.googlecode.com/ | ||
14 | |||
15 | config RAMZSWAP_STATS | ||
16 | bool "Enable ramzswap stats" | ||
17 | depends on RAMZSWAP | ||
18 | default y | ||
19 | help | ||
20 | Enable statistics collection for ramzswap. This adds only a minimal | ||
21 | overhead. In unsure, say Y. | ||
diff --git a/drivers/staging/ramzswap/Makefile b/drivers/staging/ramzswap/Makefile deleted file mode 100644 index 507d7dc3b86..00000000000 --- a/drivers/staging/ramzswap/Makefile +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | ramzswap-objs := ramzswap_drv.o xvmalloc.o | ||
2 | |||
3 | obj-$(CONFIG_RAMZSWAP) += ramzswap.o | ||
diff --git a/drivers/staging/zram/Kconfig b/drivers/staging/zram/Kconfig new file mode 100644 index 00000000000..5bcfe16feb1 --- /dev/null +++ b/drivers/staging/zram/Kconfig | |||
@@ -0,0 +1,28 @@ | |||
1 | config ZRAM | ||
2 | tristate "Compressed RAM block device support" | ||
3 | select LZO_COMPRESS | ||
4 | select LZO_DECOMPRESS | ||
5 | default n | ||
6 | help | ||
7 | Creates virtual block devices called /dev/zramX (X = 0, 1, ...). | ||
8 | Pages written to these disks are compressed and stored in memory | ||
9 | itself. These disks allow very fast I/O and compression provides | ||
10 | good amounts of memory savings. | ||
11 | |||
12 | It has several use cases, for example: /tmp storage, use as swap | ||
13 | disks and maybe many more. | ||
14 | |||
15 | See zram.txt for more information. | ||
16 | Project home: http://compcache.googlecode.com/ | ||
17 | |||
18 | config ZRAM_STATS | ||
19 | bool "Enable statistics for compressed RAM disks" | ||
20 | depends on ZRAM | ||
21 | default y | ||
22 | help | ||
23 | Enable statistics collection for compressed RAM devices. Statistics | ||
24 | are exported through ioctl interface, so you have to use zramconfig | ||
25 | program to get them. This adds only a minimal overhead. | ||
26 | |||
27 | If unsure, say Y. | ||
28 | |||
diff --git a/drivers/staging/zram/Makefile b/drivers/staging/zram/Makefile new file mode 100644 index 00000000000..b2c087aa105 --- /dev/null +++ b/drivers/staging/zram/Makefile | |||
@@ -0,0 +1,3 @@ | |||
1 | zram-objs := zram_drv.o xvmalloc.o | ||
2 | |||
3 | obj-$(CONFIG_ZRAM) += zram.o | ||
diff --git a/drivers/staging/ramzswap/xvmalloc.c b/drivers/staging/zram/xvmalloc.c index 3fdbb8ada82..3fdbb8ada82 100644 --- a/drivers/staging/ramzswap/xvmalloc.c +++ b/drivers/staging/zram/xvmalloc.c | |||
diff --git a/drivers/staging/ramzswap/xvmalloc.h b/drivers/staging/zram/xvmalloc.h index 5b1a81aa5fa..5b1a81aa5fa 100644 --- a/drivers/staging/ramzswap/xvmalloc.h +++ b/drivers/staging/zram/xvmalloc.h | |||
diff --git a/drivers/staging/ramzswap/xvmalloc_int.h b/drivers/staging/zram/xvmalloc_int.h index e23ed5c8b8e..e23ed5c8b8e 100644 --- a/drivers/staging/ramzswap/xvmalloc_int.h +++ b/drivers/staging/zram/xvmalloc_int.h | |||
diff --git a/drivers/staging/ramzswap/ramzswap.txt b/drivers/staging/zram/zram.txt index 9694acfeb43..9694acfeb43 100644 --- a/drivers/staging/ramzswap/ramzswap.txt +++ b/drivers/staging/zram/zram.txt | |||
diff --git a/drivers/staging/ramzswap/ramzswap_drv.c b/drivers/staging/zram/zram_drv.c index 7b5cc61b3d6..e9b064c2148 100644 --- a/drivers/staging/ramzswap/ramzswap_drv.c +++ b/drivers/staging/zram/zram_drv.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <linux/swapops.h> | 30 | #include <linux/swapops.h> |
31 | #include <linux/vmalloc.h> | 31 | #include <linux/vmalloc.h> |
32 | 32 | ||
33 | #include "ramzswap_drv.h" | 33 | #include "zram_drv.h" |
34 | 34 | ||
35 | /* Globals */ | 35 | /* Globals */ |
36 | static int ramzswap_major; | 36 | static int ramzswap_major; |
diff --git a/drivers/staging/ramzswap/ramzswap_drv.h b/drivers/staging/zram/zram_drv.h index ad91726013b..4d2e48a2347 100644 --- a/drivers/staging/ramzswap/ramzswap_drv.h +++ b/drivers/staging/zram/zram_drv.h | |||
@@ -18,7 +18,7 @@ | |||
18 | #include <linux/spinlock.h> | 18 | #include <linux/spinlock.h> |
19 | #include <linux/mutex.h> | 19 | #include <linux/mutex.h> |
20 | 20 | ||
21 | #include "ramzswap_ioctl.h" | 21 | #include "zram_ioctl.h" |
22 | #include "xvmalloc.h" | 22 | #include "xvmalloc.h" |
23 | 23 | ||
24 | /* | 24 | /* |
diff --git a/drivers/staging/ramzswap/ramzswap_ioctl.h b/drivers/staging/zram/zram_ioctl.h index db94bcb4296..db94bcb4296 100644 --- a/drivers/staging/ramzswap/ramzswap_ioctl.h +++ b/drivers/staging/zram/zram_ioctl.h | |||