diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2017-03-07 00:22:51 -0700 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2017-03-07 00:22:51 -0700 |
| commit | 07d045372921bfaa843ea00749c150b099ca0a49 (patch) | |
| tree | f849e8432047d3e0fc04590ddfb6a76ba953f9b6 /crypto/ablkcipher.c | |
| parent | 1bd9a34ffdd5f22ef74ed68b5d8b6fb4b781d58c (diff) | |
| parent | 4c6427919ee920d5963cf826de76292286342aa0 (diff) | |
| download | linux-crypto-07d045372921bfaa843ea00749c150b099ca0a49.tar.gz linux-crypto-07d045372921bfaa843ea00749c150b099ca0a49.zip | |
Merge tag 'v4.11-rc1' into docs-next
Linux 4.11-rc1
Diffstat (limited to '')
| -rw-r--r-- | crypto/ablkcipher.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c index d676fc59..d880a489 100644 --- a/crypto/ablkcipher.c +++ b/crypto/ablkcipher.c @@ -19,6 +19,7 @@ #include <linux/slab.h> #include <linux/seq_file.h> #include <linux/cryptouser.h> +#include <linux/compiler.h> #include <net/netlink.h> #include <crypto/scatterwalk.h> @@ -394,7 +395,7 @@ static int crypto_ablkcipher_report(struct sk_buff *skb, struct crypto_alg *alg) #endif static void crypto_ablkcipher_show(struct seq_file *m, struct crypto_alg *alg) - __attribute__ ((unused)); + __maybe_unused; static void crypto_ablkcipher_show(struct seq_file *m, struct crypto_alg *alg) { struct ablkcipher_alg *ablkcipher = &alg->cra_ablkcipher; @@ -468,7 +469,7 @@ static int crypto_givcipher_report(struct sk_buff *skb, struct crypto_alg *alg) #endif static void crypto_givcipher_show(struct seq_file *m, struct crypto_alg *alg) - __attribute__ ((unused)); + __maybe_unused; static void crypto_givcipher_show(struct seq_file *m, struct crypto_alg *alg) { struct ablkcipher_alg *ablkcipher = &alg->cra_ablkcipher; |