diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-02-09 16:21:25 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-02-09 16:21:25 +0800 |
commit | 1203868ffa16d93234dc005fba95b6596b87ddb5 (patch) | |
tree | 0e24f2baa99515d0045998361a2294e2b2b25484 /crypto/algif_hash.c | |
parent | 03b862ce80d27a26f8add26a547b3dc7b4d561d6 (diff) | |
parent | 054f8fe34189a62a0b87700c062a18c3a8421615 (diff) |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-17.03-androidlsk-v3.18-17.02-android
Diffstat (limited to 'crypto/algif_hash.c')
-rw-r--r-- | crypto/algif_hash.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c index 434af81b9e33..df99445a899a 100644 --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c @@ -283,8 +283,8 @@ unlock_child: return err; } -static int hash_sendmsg_nokey(struct socket *sock, struct msghdr *msg, - size_t size) +static int hash_sendmsg_nokey(struct kiocb *unused, struct socket *sock, + struct msghdr *msg, size_t size) { int err; @@ -307,8 +307,8 @@ static ssize_t hash_sendpage_nokey(struct socket *sock, struct page *page, return hash_sendpage(sock, page, offset, size, flags); } -static int hash_recvmsg_nokey(struct socket *sock, struct msghdr *msg, - size_t ignored, int flags) +static int hash_recvmsg_nokey(struct kiocb *unused, struct socket *sock, + struct msghdr *msg, size_t ignored, int flags) { int err; |