Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto update from Herbert Xu:
 "* sha512 bug fixes (already in your tree).
  * SHA224/SHA384 AEAD support in caam.
  * X86-64 optimised version of Camellia.
  * Tegra AES support.
  * Bulk algorithm registration interface to make driver registration easier.
  * padata race fixes.
  * Misc fixes."

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (31 commits)
  padata: Fix race on sequence number wrap
  padata: Fix race in the serialization path
  crypto: camellia - add assembler implementation for x86_64
  crypto: camellia - rename camellia.c to camellia_generic.c
  crypto: camellia - fix checkpatch warnings
  crypto: camellia - rename camellia module to camellia_generic
  crypto: tcrypt - add more camellia tests
  crypto: testmgr - add more camellia test vectors
  crypto: camellia - simplify key setup and CAMELLIA_ROUNDSM macro
  crypto: twofish-x86_64/i586 - set alignmask to zero
  crypto: blowfish-x86_64 - set alignmask to zero
  crypto: serpent-sse2 - combine ablk_*_init functions
  crypto: blowfish-x86_64 - use crypto_[un]register_algs
  crypto: twofish-x86_64-3way - use crypto_[un]register_algs
  crypto: serpent-sse2 - use crypto_[un]register_algs
  crypto: serpent-sse2 - remove dead code from serpent_sse2_glue.c::serpent_sse2_init()
  crypto: twofish-x86 - Remove dead code from twofish_glue_3way.c::init()
  crypto: In crypto_add_alg(), 'exact' wants to be initialized to 0
  crypto: caam - fix gcc 4.6 warning
  crypto: Add bulk algorithm registration interface
  ...

1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/crypto/mv_cesa.c b/drivers/crypto/mv_cesa.c
index 0d40cf66b3cc..e6ecc5f23943 100644
--- a/drivers/crypto/mv_cesa.c
+++ b/drivers/crypto/mv_cesa.c
@@ -899,7 +899,8 @@ struct crypto_alg mv_aes_alg_ecb = {
         .cra_name               = "ecb(aes)",
         .cra_driver_name        = "mv-ecb-aes",
         .cra_priority   = 300,
-        .cra_flags      = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
+        .cra_flags      = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                          CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC,
         .cra_blocksize  = 16,
         .cra_ctxsize    = sizeof(struct mv_ctx),
         .cra_alignmask  = 0,
@@ -921,7 +922,8 @@ struct crypto_alg mv_aes_alg_cbc = {
         .cra_name               = "cbc(aes)",
         .cra_driver_name        = "mv-cbc-aes",
         .cra_priority   = 300,
-        .cra_flags      = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
+        .cra_flags      = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                          CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC,
         .cra_blocksize  = AES_BLOCK_SIZE,
         .cra_ctxsize    = sizeof(struct mv_ctx),
         .cra_alignmask  = 0,
@@ -953,7 +955,8 @@ struct ahash_alg mv_sha1_alg = {
                           .cra_driver_name = "mv-sha1",
                           .cra_priority = 300,
                           .cra_flags =
-                          CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK,
+                          CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY |
+                          CRYPTO_ALG_NEED_FALLBACK,
                           .cra_blocksize = SHA1_BLOCK_SIZE,
                           .cra_ctxsize = sizeof(struct mv_tfm_hash_ctx),
                           .cra_init = mv_cra_hash_sha1_init,
@@ -977,7 +980,8 @@ struct ahash_alg mv_hmac_sha1_alg = {
                           .cra_driver_name = "mv-hmac-sha1",
                           .cra_priority = 300,
                           .cra_flags =
-                          CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK,
+                          CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY |
+                          CRYPTO_ALG_NEED_FALLBACK,
                           .cra_blocksize = SHA1_BLOCK_SIZE,
                           .cra_ctxsize = sizeof(struct mv_tfm_hash_ctx),
                           .cra_init = mv_cra_hash_hmac_sha1_init,