diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-09-19 18:46:43 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-09-19 18:46:43 +0200 |
| commit | 43cdd088b1b10306d4eb6d9208b62c7f60abffeb (patch) | |
| tree | 8dd799379a241c1b47b736299c306eb77f06e6ff /include/linux/socket.h | |
| parent | bf69aa906ccddacc9e966794869431374953738a (diff) | |
| parent | 4028b6c4c03f213260e9290ff3a6b5439aad07ce (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'include/linux/socket.h')
| -rw-r--r-- | include/linux/socket.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h index 230c04bda3e2..445ef7519dc2 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -313,6 +313,8 @@ extern int csum_partial_copy_fromiovecend(unsigned char *kdata, struct iovec *iov, int offset, unsigned int len, __wsum *csump); +extern unsigned long iov_pages(const struct iovec *iov, int offset, + unsigned long nr_segs); extern int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *address, int mode); extern int memcpy_toiovecend(const struct iovec *v, unsigned char *kdata, |