diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2014-07-18 23:24:18 +0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-07-18 23:24:18 +0400 |
| commit | a7a30232df01db886473324050d79c3122937c78 (patch) | |
| tree | 76323b745b44b792173575843a72a2f6baa8a6da /include/linux/socket.h | |
| parent | f86e0add813a3cc0e338089fa6c0928f5f6dc52d (diff) | |
| parent | fce9e5bb25264153f9f002eada41757118d25ba9 (diff) | |
| download | linux-a7a30232df01db886473324050d79c3122937c78.tar.xz | |
Merge branch 'v3.17-next/cleanup-samsung' into v3.17-next/dt-s5pv210
Diffstat (limited to 'include/linux/socket.h')
| -rw-r--r-- | include/linux/socket.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h index 8e98297f1388..ec538fc287a6 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -305,8 +305,6 @@ struct ucred { /* IPX options */ #define IPX_TYPE 1 -extern int memcpy_fromiovecend(unsigned char *kdata, const struct iovec *iov, - int offset, int len); extern int csum_partial_copy_fromiovecend(unsigned char *kdata, struct iovec *iov, int offset, @@ -315,8 +313,6 @@ 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, - int offset, int len); extern int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr_storage *kaddr); extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data); |