diff options
| author | James Morris <james.morris@microsoft.com> | 2019-03-26 16:28:01 -0700 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2019-03-26 16:28:01 -0700 |
| commit | 0d79d47e75b64925d32d790a0907fbbaeb16cf1a (patch) | |
| tree | 92cc49cb728ae789fcf1306a4a36206cd0f7a098 /crypto/crypto_user_stat.c | |
| parent | aaf6aed3ef1a735e34339a51f26f5f3e5fe9a478 (diff) | |
| parent | 1d5d6bd2502dff39b91d2280711ecbf86c1287a8 (diff) | |
| download | linux-crypto-0d79d47e75b64925d32d790a0907fbbaeb16cf1a.tar.gz linux-crypto-0d79d47e75b64925d32d790a0907fbbaeb16cf1a.zip | |
Merge tag 'v5.1-rc2' into next-general
Merge to Linux 5.1-rc2 for subsystems to work with.
Diffstat (limited to '')
| -rw-r--r-- | crypto/crypto_user_stat.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/crypto/crypto_user_stat.c b/crypto/crypto_user_stat.c index 3e9a5323..a03f326a 100644 --- a/crypto/crypto_user_stat.c +++ b/crypto/crypto_user_stat.c @@ -20,10 +20,6 @@ #define null_terminated(x) (strnlen(x, sizeof(x)) < sizeof(x)) -static DEFINE_MUTEX(crypto_cfg_mutex); - -extern struct sock *crypto_nlsk; - struct crypto_dump_info { struct sk_buff *in_skb; struct sk_buff *out_skb; |