kernel: clean up 260-crypto_test_dependencies.patch to get rid of some more kernel bloat
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
parent
fa85ee1d4e
commit
7bf3695b02
3 changed files with 15 additions and 10 deletions
|
@ -20,11 +20,9 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||||
fs/ubifs/super.c | 14 +++++++-------
|
fs/ubifs/super.c | 14 +++++++-------
|
||||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
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
|
--- a/fs/ubifs/super.c
|
||||||
+++ b/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;
|
c->max_write_shift = fls(c->max_write_size) - 1;
|
||||||
|
|
||||||
if (c->leb_size < UBIFS_MIN_LEB_SZ) {
|
if (c->leb_size < UBIFS_MIN_LEB_SZ) {
|
||||||
|
@ -49,7 +47,7 @@ index 736dd58..4ec0510 100644
|
||||||
return -EINVAL;
|
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 ||
|
if (c->max_write_size < c->min_io_size ||
|
||||||
c->max_write_size % c->min_io_size ||
|
c->max_write_size % c->min_io_size ||
|
||||||
!is_power_of_2(c->max_write_size)) {
|
!is_power_of_2(c->max_write_size)) {
|
||||||
|
@ -60,6 +58,3 @@ index 736dd58..4ec0510 100644
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
--
|
|
||||||
2.9.0
|
|
||||||
|
|
||||||
|
|
|
@ -1,14 +1,16 @@
|
||||||
--- a/crypto/Kconfig
|
--- a/crypto/Kconfig
|
||||||
+++ b/crypto/Kconfig
|
+++ b/crypto/Kconfig
|
||||||
@@ -119,11 +119,11 @@ config CRYPTO_MANAGER
|
@@ -118,12 +118,12 @@ config CRYPTO_MANAGER
|
||||||
|
cbc(aes).
|
||||||
|
|
||||||
config CRYPTO_MANAGER2
|
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_AEAD2
|
||||||
- select CRYPTO_HASH2
|
- select CRYPTO_HASH2
|
||||||
- select CRYPTO_BLKCIPHER2
|
- select CRYPTO_BLKCIPHER2
|
||||||
- select CRYPTO_PCOMP2
|
- select CRYPTO_PCOMP2
|
||||||
- select CRYPTO_AKCIPHER2
|
- 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_AEAD2 if !CRYPTO_MANAGER_DISABLE_TESTS
|
||||||
+ select CRYPTO_HASH2 if !CRYPTO_MANAGER_DISABLE_TESTS
|
+ select CRYPTO_HASH2 if !CRYPTO_MANAGER_DISABLE_TESTS
|
||||||
+ select CRYPTO_BLKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS
|
+ select CRYPTO_BLKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS
|
||||||
|
@ -17,6 +19,14 @@
|
||||||
|
|
||||||
config CRYPTO_USER
|
config CRYPTO_USER
|
||||||
tristate "Userspace cryptographic algorithm configuration"
|
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
|
--- a/crypto/algboss.c
|
||||||
+++ b/crypto/algboss.c
|
+++ b/crypto/algboss.c
|
||||||
@@ -248,12 +248,16 @@ static int cryptomgr_schedule_test(struc
|
@@ -248,12 +248,16 @@ static int cryptomgr_schedule_test(struc
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/crypto/Kconfig
|
--- a/crypto/Kconfig
|
||||||
+++ b/crypto/Kconfig
|
+++ b/crypto/Kconfig
|
||||||
@@ -1545,6 +1545,13 @@ config CRYPTO_LZ4HC
|
@@ -1544,6 +1544,13 @@ config CRYPTO_LZ4HC
|
||||||
help
|
help
|
||||||
This is the LZ4 high compression mode algorithm.
|
This is the LZ4 high compression mode algorithm.
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue