aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-08-03 17:34:04 +0200
committerFelix Fietkau <nbd@nbd.name>2016-08-03 19:16:32 +0200
commit7bf3695b0230d4cc4b6348f7c87b3c164314db8d (patch)
treeed7c51e9799f1a5268b387b38bf78eaf5b07bf58
parentfa85ee1d4ef6bbbc75c8159c4bc1c3b52e2b889b (diff)
downloadupstream-7bf3695b0230d4cc4b6348f7c87b3c164314db8d.tar.gz
upstream-7bf3695b0230d4cc4b6348f7c87b3c164314db8d.tar.bz2
upstream-7bf3695b0230d4cc4b6348f7c87b3c164314db8d.zip
kernel: clean up 260-crypto_test_dependencies.patch to get rid of some more kernel bloat
Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--target/linux/generic/patches-4.4/047-ubifs-silence-another-error-if-MS_SILENT-is-set.patch9
-rw-r--r--target/linux/generic/patches-4.4/260-crypto_test_dependencies.patch14
-rw-r--r--target/linux/generic/patches-4.4/540-crypto-xz-decompression-support.patch2
3 files changed, 15 insertions, 10 deletions
diff --git a/target/linux/generic/patches-4.4/047-ubifs-silence-another-error-if-MS_SILENT-is-set.patch b/target/linux/generic/patches-4.4/047-ubifs-silence-another-error-if-MS_SILENT-is-set.patch
index 290a7d69c6..40fa423aab 100644
--- a/target/linux/generic/patches-4.4/047-ubifs-silence-another-error-if-MS_SILENT-is-set.patch
+++ b/target/linux/generic/patches-4.4/047-ubifs-silence-another-error-if-MS_SILENT-is-set.patch
@@ -20,11 +20,9 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
fs/ubifs/super.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
-diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
-index 736dd58..4ec0510 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
-@@ -520,19 +520,19 @@ static int init_constants_early(struct ubifs_info *c)
+@@ -520,19 +520,19 @@ static int init_constants_early(struct u
c->max_write_shift = fls(c->max_write_size) - 1;
if (c->leb_size < UBIFS_MIN_LEB_SZ) {
@@ -49,7 +47,7 @@ index 736dd58..4ec0510 100644
return -EINVAL;
}
-@@ -543,8 +543,8 @@ static int init_constants_early(struct ubifs_info *c)
+@@ -543,8 +543,8 @@ static int init_constants_early(struct u
if (c->max_write_size < c->min_io_size ||
c->max_write_size % c->min_io_size ||
!is_power_of_2(c->max_write_size)) {
@@ -60,6 +58,3 @@ index 736dd58..4ec0510 100644
return -EINVAL;
}
---
-2.9.0
-
diff --git a/target/linux/generic/patches-4.4/260-crypto_test_dependencies.patch b/target/linux/generic/patches-4.4/260-crypto_test_dependencies.patch
index c5606a0085..54b8730a93 100644
--- a/target/linux/generic/patches-4.4/260-crypto_test_dependencies.patch
+++ b/target/linux/generic/patches-4.4/260-crypto_test_dependencies.patch
@@ -1,14 +1,16 @@
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
-@@ -119,11 +119,11 @@ config CRYPTO_MANAGER
+@@ -118,12 +118,12 @@ config CRYPTO_MANAGER
+ cbc(aes).
config CRYPTO_MANAGER2
- def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y)
+- def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y)
- select CRYPTO_AEAD2
- select CRYPTO_HASH2
- select CRYPTO_BLKCIPHER2
- select CRYPTO_PCOMP2
- select CRYPTO_AKCIPHER2
++ def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y && !CRYPTO_MANAGER_DISABLE_TESTS)
+ select CRYPTO_AEAD2 if !CRYPTO_MANAGER_DISABLE_TESTS
+ select CRYPTO_HASH2 if !CRYPTO_MANAGER_DISABLE_TESTS
+ select CRYPTO_BLKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS
@@ -17,6 +19,14 @@
config CRYPTO_USER
tristate "Userspace cryptographic algorithm configuration"
+@@ -136,7 +136,6 @@ config CRYPTO_USER
+ config CRYPTO_MANAGER_DISABLE_TESTS
+ bool "Disable run-time self tests"
+ default y
+- depends on CRYPTO_MANAGER2
+ help
+ Disable run-time self tests that normally take place at
+ algorithm registration.
--- a/crypto/algboss.c
+++ b/crypto/algboss.c
@@ -248,12 +248,16 @@ static int cryptomgr_schedule_test(struc
diff --git a/target/linux/generic/patches-4.4/540-crypto-xz-decompression-support.patch b/target/linux/generic/patches-4.4/540-crypto-xz-decompression-support.patch
index d2f9244ef5..86017b5660 100644
--- a/target/linux/generic/patches-4.4/540-crypto-xz-decompression-support.patch
+++ b/target/linux/generic/patches-4.4/540-crypto-xz-decompression-support.patch
@@ -1,6 +1,6 @@
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
-@@ -1545,6 +1545,13 @@ config CRYPTO_LZ4HC
+@@ -1544,6 +1544,13 @@ config CRYPTO_LZ4HC
help
This is the LZ4 high compression mode algorithm.