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, 4 insertions, 2 deletions

diff --git a/drivers/crypto/geode-aes.c b/drivers/crypto/geode-aes.c
index 219d09cbb0d1..f3e36c86b6c3 100644
--- a/drivers/crypto/geode-aes.c
+++ b/drivers/crypto/geode-aes.c
@@ -393,7 +393,8 @@ static struct crypto_alg geode_cbc_alg = {
         .cra_driver_name        =       "cbc-aes-geode",
         .cra_priority           =       400,
         .cra_flags                      =       CRYPTO_ALG_TYPE_BLKCIPHER |
-                                                        CRYPTO_ALG_NEED_FALLBACK,
+                                                CRYPTO_ALG_KERN_DRIVER_ONLY |
+                                                CRYPTO_ALG_NEED_FALLBACK,
         .cra_init                       =       fallback_init_blk,
         .cra_exit                       =       fallback_exit_blk,
         .cra_blocksize          =       AES_MIN_BLOCK_SIZE,
@@ -479,7 +480,8 @@ static struct crypto_alg geode_ecb_alg = {
         .cra_driver_name        =       "ecb-aes-geode",
         .cra_priority           =       400,
         .cra_flags                      =       CRYPTO_ALG_TYPE_BLKCIPHER |
-                                                        CRYPTO_ALG_NEED_FALLBACK,
+                                                CRYPTO_ALG_KERN_DRIVER_ONLY |
+                                                CRYPTO_ALG_NEED_FALLBACK,
         .cra_init                       =       fallback_init_blk,
         .cra_exit                       =       fallback_exit_blk,
         .cra_blocksize          =       AES_MIN_BLOCK_SIZE,