diff options
| author | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-11-03 14:18:11 +0000 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-11-03 14:18:11 +0000 |
| commit | 0a27f050abcd661cd4838e1b1ced117ec19d0d99 (patch) | |
| tree | 3ba75bb876cc6f39a7338b6dae0fd3d1173c6e41 /include/linux/socket.h | |
| parent | 7e6120c57cf92f005f72c6345c0961415099881e (diff) | |
| parent | c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 (diff) | |
Merge commit 'v2.6.37-rc1' into for-2.6.38
Diffstat (limited to 'include/linux/socket.h')
| -rw-r--r-- | include/linux/socket.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h index a8f56e1ec760..86b652fabf6e 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -322,11 +322,10 @@ extern int csum_partial_copy_fromiovecend(unsigned char *kdata, int offset, unsigned int len, __wsum *csump); -extern long verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address, int mode); +extern int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address, int mode); extern int memcpy_toiovec(struct iovec *v, unsigned char *kdata, int len); extern int memcpy_toiovecend(const struct iovec *v, unsigned char *kdata, int offset, int len); -extern int move_addr_to_user(struct sockaddr *kaddr, int klen, void __user *uaddr, int __user *ulen); extern int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr *kaddr); extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data); |