diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2010-08-06 09:40:28 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2010-08-06 09:40:28 +0800 |
| commit | 326a6346ffb5b19eb593530d9d3096d409e46f62 (patch) | |
| tree | c049bbde5ec2e214edb42822688a9c8b2628dfbc /crypto/testmgr.c | |
| parent | 23a75eee070f1370bee803a34f285cf81eb5f331 (diff) | |
| download | linux-stable-326a6346ffb5b19eb593530d9d3096d409e46f62.tar.gz linux-stable-326a6346ffb5b19eb593530d9d3096d409e46f62.tar.bz2 linux-stable-326a6346ffb5b19eb593530d9d3096d409e46f62.zip | |
crypto: testmgr - Fix test disabling option
This patch fixes a serious bug in the test disabling patch where
it can cause an spurious load of the cryptomgr module even when
it's compiled in.
It also negates the test disabling option so that its absence
causes tests to be enabled.
The Kconfig option is also now behind EMBEDDED.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/testmgr.c')
| -rw-r--r-- | crypto/testmgr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/testmgr.c b/crypto/testmgr.c index abd980c729eb..fa8c8f78c8d4 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -23,7 +23,7 @@ #include "internal.h" -#ifndef CONFIG_CRYPTO_MANAGER_TESTS +#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS /* a perfect nop */ int alg_test(const char *driver, const char *alg, u32 type, u32 mask) @@ -2542,6 +2542,6 @@ non_fips_alg: return -EINVAL; } -#endif /* CONFIG_CRYPTO_MANAGER_TESTS */ +#endif /* CONFIG_CRYPTO_MANAGER_DISABLE_TESTS */ EXPORT_SYMBOL_GPL(alg_test); |