Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / security / keys / trusted.c

diff --git a/security/keys/trusted.c b/security/keys/trusted.c
index 697bfc6c819236c39b828fc786cd6d08ff7bd592..4d98f4f87236c5091d8318485a1193c7c45c9273 100644 (file)
--- a/security/keys/trusted.c
+++ b/security/keys/trusted.c
@@ -1199,14 +1199,14 @@ static int __init trusted_shash_alloc(void)
 {
        int ret;
 
-       hmacalg = crypto_alloc_shash(hmac_alg, 0, CRYPTO_ALG_ASYNC);
+       hmacalg = crypto_alloc_shash(hmac_alg, 0, 0);
        if (IS_ERR(hmacalg)) {
                pr_info("trusted_key: could not allocate crypto %s\n",
                        hmac_alg);
                return PTR_ERR(hmacalg);
        }
 
-       hashalg = crypto_alloc_shash(hash_alg, 0, CRYPTO_ALG_ASYNC);
+       hashalg = crypto_alloc_shash(hash_alg, 0, 0);
        if (IS_ERR(hashalg)) {
                pr_info("trusted_key: could not allocate crypto %s\n",
                        hash_alg);