summaryrefslogtreecommitdiff
path: root/crypto/api.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2018-03-07 13:57:24 +0100
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2018-03-07 13:57:24 +0100
commit249b6bae56fc18f4512fe5bc085f71cc235c0735 (patch)
tree89cf28b0e13c85f0a04d216121cbdafdf9668ba0 /crypto/api.c
parent59d9ddb192bc424cc53e52180478001af4fb99a4 (diff)
parentc7ee969dff58a7f5e447e27fe064e2d1ce81d574 (diff)
downloadlinux-crypto-249b6bae56fc18f4512fe5bc085f71cc235c0735.tar.gz
linux-crypto-249b6bae56fc18f4512fe5bc085f71cc235c0735.zip
Merge tag 'v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Linux 4.16-rc4
Diffstat (limited to 'crypto/api.c')
-rw-r--r--crypto/api.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/api.c b/crypto/api.c
index 2a2479d1..70a894e5 100644
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -137,7 +137,7 @@ static struct crypto_alg *crypto_larval_add(const char *name, u32 type,
if (IS_ERR(larval))
return ERR_CAST(larval);
- atomic_set(&larval->alg.cra_refcnt, 2);
+ refcount_set(&larval->alg.cra_refcnt, 2);
down_write(&crypto_alg_sem);
alg = __crypto_alg_lookup(name, type, mask);
@@ -205,7 +205,8 @@ struct crypto_alg *crypto_alg_lookup(const char *name, u32 type, u32 mask)
}
EXPORT_SYMBOL_GPL(crypto_alg_lookup);
-struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, u32 mask)
+static struct crypto_alg *crypto_larval_lookup(const char *name, u32 type,
+ u32 mask)
{
struct crypto_alg *alg;
@@ -231,7 +232,6 @@ struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, u32 mask)
return crypto_larval_add(name, type, mask);
}
-EXPORT_SYMBOL_GPL(crypto_larval_lookup);
int crypto_probing_notify(unsigned long val, void *v)
{