OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6849209
)
UPSTREAM: zram: add more compression algorithms
author
Sergey Senozhatsky
<sergey.senozhatsky@gmail.com>
Tue, 26 Jul 2016 22:22:56 +0000
(15:22 -0700)
committer
Peter Kalauskas
<peskal@google.com>
Thu, 23 Aug 2018 19:00:16 +0000
(12:00 -0700)
Add "deflate", "lz4hc", "842" algorithms to the list of known
compression backends. The real availability of those algorithms,
however, depends on the corresponding CONFIG_CRYPTO_FOO config options.
[sergey.senozhatsky@gmail.com: zram-add-more-compression-algorithms-v3]
Link:
http://lkml.kernel.org/r/20160604024902.11778-7-sergey.senozhatsky@gmail.com
Link:
http://lkml.kernel.org/r/20160531122017.2878-8-sergey.senozhatsky@gmail.com
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Acked-by: Minchan Kim <minchan@kernel.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit
eb9f56d82547db407779967a2251ea28969245b0
)
Signed-off-by: Peter Kalauskas <peskal@google.com>
Bug:
112488418
Change-Id: Ie46c7676363ef13c559b45dab4968e2cc48a6cbe
drivers/block/zram/zcomp.c
patch
|
blob
|
history
diff --git
a/drivers/block/zram/zcomp.c
b/drivers/block/zram/zcomp.c
index
9ab45d4
..
32e521a
100644
(file)
--- a/
drivers/block/zram/zcomp.c
+++ b/
drivers/block/zram/zcomp.c
@@
-23,6
+23,15
@@
static const char * const backends[] = {
#if IS_ENABLED(CONFIG_CRYPTO_LZ4)
"lz4",
#endif
+#if IS_ENABLED(CONFIG_CRYPTO_DEFLATE)
+ "deflate",
+#endif
+#if IS_ENABLED(CONFIG_CRYPTO_LZ4HC)
+ "lz4hc",
+#endif
+#if IS_ENABLED(CONFIG_CRYPTO_842)
+ "842",
+#endif
NULL
};