diff options
| author |   Michal Marek <mmarek@suse.cz> | 2011-06-08 16:01:34 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2011-06-08 16:01:34 +0200 |
| commit | a61944c251c3e68c4bbf6eb96ff61c7b286351c5 (patch) | |
| tree | fd9f82297805d043a45a828626dfd29bddc48b00 /include/linux/socket.h | |
| parent | Merge branch 'kbuild/kconfig-for-40' into kbuild/kconfig (diff) | |
| parent | Linux 3.0-rc1 (diff) | |
Merge commit 'v3.0-rc1' into kbuild/kconfig
Diffstat (limited to 'include/linux/socket.h')
| -rw-r--r-- | include/linux/socket.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h index edbb1d07ddf4..4ef98e422fde 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -88,7 +88,7 @@ struct cmsghdr { }; /* - * Ancilliary data object information MACROS + * Ancillary data object information MACROS * Table 5-14 of POSIX 1003.1g */ @@ -333,5 +333,7 @@ struct timespec; extern int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen, unsigned int flags, struct timespec *timeout); +extern int __sys_sendmmsg(int fd, struct mmsghdr __user *mmsg, + unsigned int vlen, unsigned int flags); #endif /* not kernel and not glibc */ #endif /* _LINUX_SOCKET_H */ |