diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-10-19 03:13:04 -0400 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-10-19 03:13:04 -0400 |
| commit | fa251f89903d73989e2f63e13d0eaed1e07ce0da (patch) | |
| tree | 3f7fe779941e3b6d67754dd7c44a32f48ea47c74 /crypto/testmgr.c | |
| parent | dd3932eddf428571762596e17b65f5dc92ca361b (diff) | |
| parent | cd07202cc8262e1669edff0d97715f3dd9260917 (diff) | |
Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier
Conflicts:
block/blk-core.c
drivers/block/loop.c
mm/swapfile.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
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 @@ | |||
| 23 | 23 | ||
| 24 | #include "internal.h" | 24 | #include "internal.h" |
| 25 | 25 | ||
| 26 | #ifndef CONFIG_CRYPTO_MANAGER_TESTS | 26 | #ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS |
| 27 | 27 | ||
| 28 | /* a perfect nop */ | 28 | /* a perfect nop */ |
| 29 | int alg_test(const char *driver, const char *alg, u32 type, u32 mask) | 29 | int alg_test(const char *driver, const char *alg, u32 type, u32 mask) |
| @@ -2542,6 +2542,6 @@ non_fips_alg: | |||
| 2542 | return -EINVAL; | 2542 | return -EINVAL; |
| 2543 | } | 2543 | } |
| 2544 | 2544 | ||
| 2545 | #endif /* CONFIG_CRYPTO_MANAGER_TESTS */ | 2545 | #endif /* CONFIG_CRYPTO_MANAGER_DISABLE_TESTS */ |
| 2546 | 2546 | ||
| 2547 | EXPORT_SYMBOL_GPL(alg_test); | 2547 | EXPORT_SYMBOL_GPL(alg_test); |