From 88655056656fdbd9d021d8de11a6077fb49428da Mon Sep 17 00:00:00 2001
From: Luka Perkov <luka@openwrt.org>
Date: Sat, 11 Apr 2015 10:28:14 +0000
Subject: generic: drop 3.14

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 45375
---
 .../541-ubifs-xz-decompression-support.patch       | 92 ----------------------
 1 file changed, 92 deletions(-)
 delete mode 100644 target/linux/generic/patches-3.14/541-ubifs-xz-decompression-support.patch

(limited to 'target/linux/generic/patches-3.14/541-ubifs-xz-decompression-support.patch')

diff --git a/target/linux/generic/patches-3.14/541-ubifs-xz-decompression-support.patch b/target/linux/generic/patches-3.14/541-ubifs-xz-decompression-support.patch
deleted file mode 100644
index f85689c586..0000000000
--- a/target/linux/generic/patches-3.14/541-ubifs-xz-decompression-support.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- a/fs/ubifs/Kconfig
-+++ b/fs/ubifs/Kconfig
-@@ -5,8 +5,10 @@ config UBIFS_FS
- 	select CRYPTO if UBIFS_FS_ADVANCED_COMPR
- 	select CRYPTO if UBIFS_FS_LZO
- 	select CRYPTO if UBIFS_FS_ZLIB
-+	select CRYPTO if UBIFS_FS_XZ
- 	select CRYPTO_LZO if UBIFS_FS_LZO
- 	select CRYPTO_DEFLATE if UBIFS_FS_ZLIB
-+	select CRYPTO_XZ if UBIFS_FS_XZ
- 	depends on MTD_UBI
- 	help
- 	  UBIFS is a file system for flash devices which works on top of UBI.
-@@ -35,3 +37,12 @@ config UBIFS_FS_ZLIB
- 	default y
- 	help
- 	  Zlib compresses better than LZO but it is slower. Say 'Y' if unsure.
-+
-+config UBIFS_FS_XZ
-+	bool "XZ decompression support" if UBIFS_FS_ADVANCED_COMPR
-+	depends on UBIFS_FS
-+	default y
-+	help
-+	  XZ compresses better the ZLIB but it is slower..
-+	  Say 'Y' if unsure.
-+
---- a/fs/ubifs/compress.c
-+++ b/fs/ubifs/compress.c
-@@ -71,6 +71,24 @@ static struct ubifs_compressor zlib_comp
- };
- #endif
- 
-+#ifdef CONFIG_UBIFS_FS_XZ
-+static DEFINE_MUTEX(xz_enc_mutex);
-+static DEFINE_MUTEX(xz_dec_mutex);
-+
-+static struct ubifs_compressor xz_compr = {
-+	.compr_type = UBIFS_COMPR_XZ,
-+	.comp_mutex = &xz_enc_mutex,
-+	.decomp_mutex = &xz_dec_mutex,
-+	.name = "xz",
-+	.capi_name = "xz",
-+};
-+#else
-+static struct ubifs_compressor xz_compr = {
-+	.compr_type = UBIFS_COMPR_XZ,
-+	.name = "xz",
-+};
-+#endif
-+
- /* All UBIFS compressors */
- struct ubifs_compressor *ubifs_compressors[UBIFS_COMPR_TYPES_CNT];
- 
-@@ -232,9 +250,15 @@ int __init ubifs_compressors_init(void)
- 	if (err)
- 		goto out_lzo;
- 
-+	err = compr_init(&xz_compr);
-+	if (err)
-+		goto out_zlib;
-+
- 	ubifs_compressors[UBIFS_COMPR_NONE] = &none_compr;
- 	return 0;
- 
-+out_zlib:
-+	compr_exit(&zlib_compr);
- out_lzo:
- 	compr_exit(&lzo_compr);
- 	return err;
-@@ -247,4 +271,5 @@ void ubifs_compressors_exit(void)
- {
- 	compr_exit(&lzo_compr);
- 	compr_exit(&zlib_compr);
-+	compr_exit(&xz_compr);
- }
---- a/fs/ubifs/ubifs-media.h
-+++ b/fs/ubifs/ubifs-media.h
-@@ -332,12 +332,14 @@ enum {
-  * UBIFS_COMPR_NONE: no compression
-  * UBIFS_COMPR_LZO: LZO compression
-  * UBIFS_COMPR_ZLIB: ZLIB compression
-+ * UBIFS_COMPR_XZ: XZ compression
-  * UBIFS_COMPR_TYPES_CNT: count of supported compression types
-  */
- enum {
- 	UBIFS_COMPR_NONE,
- 	UBIFS_COMPR_LZO,
- 	UBIFS_COMPR_ZLIB,
-+	UBIFS_COMPR_XZ,
- 	UBIFS_COMPR_TYPES_CNT,
- };
- 
-- 
cgit v1.2.3