diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-04-11 14:36:30 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-04-11 14:36:30 +0200 |
| commit | 9b0dcd0e5a27958b57e3e390f63c098d63a055da (patch) | |
| tree | de778d683f121d3062df316994e9c4cf195eb12c /include/linux/socket.h | |
| parent | d7a181da2dfa3190487c446042ba01e07d851c74 (diff) | |
| parent | ac71317e6be01812cc0c54d8be6d3c1139c8380b (diff) | |
Merge tag 'asoc-fix-v5.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.1
A few core fixes along with the driver specific ones, mainly fixing
small issues that only affect x86 platforms for various reasons (their
unusual machine enumeration mechanisms mainly, plus a fix for error
handling in topology).
There's some of the driver fixes that look larger than they are, like
the hdmi-codec changes which resulted in an indentation change, and most
of the other large changes are for new drivers like the STM32 changes.
Diffstat (limited to 'include/linux/socket.h')
| -rw-r--r-- | include/linux/socket.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h index ab2041a00e01..6016daeecee4 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -349,9 +349,17 @@ struct ucred { 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); +struct timespec64; struct __kernel_timespec; struct old_timespec32; +struct scm_timestamping_internal { + struct timespec64 ts[3]; +}; + +extern void put_cmsg_scm_timestamping64(struct msghdr *msg, struct scm_timestamping_internal *tss); +extern void put_cmsg_scm_timestamping(struct msghdr *msg, struct scm_timestamping_internal *tss); + /* The __sys_...msg variants allow MSG_CMSG_COMPAT iff * forbid_cmsg_compat==false */ |