History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

No conflicts.

Jakub Kicinski committed 4 years ago

Commit 5b91c5c2 parents 4f5e483 f1baf68328 files · +4072 −1720Browse files

Showing the changes to tools/include/uapi (4 of 328 files). Show all

Unified · Split

4 files
  1. tools/include/uapi/linux/kvm.h +3 −3
  2. tools/include/uapi/linux/perf_event.h +3 −3
  3. tools/include/uapi/linux/prctl.h +3 −0
  4. tools/include/uapi/sound/asound.h +9 −2
tools/include/uapi/linux/kvm.h+3−3
@@ -1624,9 +1624,6 @@ struct kvm_enc_region { · 1623 unmodified lines
1624#define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3)1624#define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3)
1625#define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4)1625#define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4)
1626 1626
1627/* Available with KVM_CAP_XSAVE2 */
1628#define KVM_GET_XSAVE2 _IOR(KVMIO, 0xcf, struct kvm_xsave)
1629
1630struct kvm_s390_pv_sec_parm {1627struct kvm_s390_pv_sec_parm {
1631 __u64 origin;1628 __u64 origin;
1632 __u64 length;1629 __u64 length;
@@ -2048,4 +2045,7 @@ struct kvm_stats_desc { · 415 unmodified lines
2048 2045
2049#define KVM_GET_STATS_FD _IO(KVMIO, 0xce)2046#define KVM_GET_STATS_FD _IO(KVMIO, 0xce)
2050 2047
2048/* Available with KVM_CAP_XSAVE2 */
2049#define KVM_GET_XSAVE2 _IOR(KVMIO, 0xcf, struct kvm_xsave)
2050
2051#endif /* __LINUX_KVM_H */2051#endif /* __LINUX_KVM_H */
tools/include/uapi/linux/perf_event.h+3−3
@@ -1332,9 +1332,9 @@ union perf_mem_data_src { · 1331 unmodified lines
1332 1332
1333/* hop level */1333/* hop level */
1334#define PERF_MEM_HOPS_0 0x01 /* remote core, same node */1334#define PERF_MEM_HOPS_0 0x01 /* remote core, same node */
1335#define PERF_MEM_HOPS_1 0x02 /* remote node, same socket */1335#define PERF_MEM_HOPS_1 0x02 /* remote node, same socket */
1336#define PERF_MEM_HOPS_2 0x03 /* remote socket, same board */1336#define PERF_MEM_HOPS_2 0x03 /* remote socket, same board */
1337#define PERF_MEM_HOPS_3 0x04 /* remote board */1337#define PERF_MEM_HOPS_3 0x04 /* remote board */
1338/* 5-7 available */1338/* 5-7 available */
1339#define PERF_MEM_HOPS_SHIFT 431339#define PERF_MEM_HOPS_SHIFT 43
1340 1340
tools/include/uapi/linux/prctl.h+3−0
@@ -272,4 +272,7 @@ struct prctl_mm_map { · 271 unmodified lines
272# define PR_SCHED_CORE_SCOPE_THREAD_GROUP 1272# define PR_SCHED_CORE_SCOPE_THREAD_GROUP 1
273# define PR_SCHED_CORE_SCOPE_PROCESS_GROUP 2273# define PR_SCHED_CORE_SCOPE_PROCESS_GROUP 2
274 274
275#define PR_SET_VMA 0x53564d41
276# define PR_SET_VMA_ANON_NAME 0
277
275#endif /* _LINUX_PRCTL_H */278#endif /* _LINUX_PRCTL_H */
tools/include/uapi/sound/asound.h+9−2
@@ -56,8 +56,10 @@ · 55 unmodified lines
56 * *56 * *
57 ****************************************************************************/57 ****************************************************************************/
58 58
59#define AES_IEC958_STATUS_SIZE 24
60
59struct snd_aes_iec958 {61struct snd_aes_iec958 {
60 unsigned char status[24]; /* AES/IEC958 channel status bits */62 unsigned char status[AES_IEC958_STATUS_SIZE]; /* AES/IEC958 channel status bits */
61 unsigned char subcode[147]; /* AES/IEC958 subcode bits */63 unsigned char subcode[147]; /* AES/IEC958 subcode bits */
62 unsigned char pad; /* nothing */64 unsigned char pad; /* nothing */
63 unsigned char dig_subframe[4]; /* AES/IEC958 subframe bits */65 unsigned char dig_subframe[4]; /* AES/IEC958 subframe bits */
@@ -202,6 +204,11 @@ typedef int __bitwise snd_pcm_format_t; · 138 unmodified lines
202#define SNDRV_PCM_FORMAT_S24_BE ((__force snd_pcm_format_t) 7) /* low three bytes */204#define SNDRV_PCM_FORMAT_S24_BE ((__force snd_pcm_format_t) 7) /* low three bytes */
203#define SNDRV_PCM_FORMAT_U24_LE ((__force snd_pcm_format_t) 8) /* low three bytes */205#define SNDRV_PCM_FORMAT_U24_LE ((__force snd_pcm_format_t) 8) /* low three bytes */
204#define SNDRV_PCM_FORMAT_U24_BE ((__force snd_pcm_format_t) 9) /* low three bytes */206#define SNDRV_PCM_FORMAT_U24_BE ((__force snd_pcm_format_t) 9) /* low three bytes */
207/*
208 * For S32/U32 formats, 'msbits' hardware parameter is often used to deliver information about the
209 * available bit count in most significant bit. It's for the case of so-called 'left-justified' or
210 * `right-padding` sample which has less width than 32 bit.
211 */
205#define SNDRV_PCM_FORMAT_S32_LE ((__force snd_pcm_format_t) 10)212#define SNDRV_PCM_FORMAT_S32_LE ((__force snd_pcm_format_t) 10)
206#define SNDRV_PCM_FORMAT_S32_BE ((__force snd_pcm_format_t) 11)213#define SNDRV_PCM_FORMAT_S32_BE ((__force snd_pcm_format_t) 11)
207#define SNDRV_PCM_FORMAT_U32_LE ((__force snd_pcm_format_t) 12)214#define SNDRV_PCM_FORMAT_U32_LE ((__force snd_pcm_format_t) 12)
@@ -300,7 +307,7 @@ typedef int __bitwise snd_pcm_subformat_t; · 92 unmodified lines
300#define SNDRV_PCM_INFO_HAS_LINK_ESTIMATED_ATIME 0x04000000 /* report estimated link audio time */307#define SNDRV_PCM_INFO_HAS_LINK_ESTIMATED_ATIME 0x04000000 /* report estimated link audio time */
301#define SNDRV_PCM_INFO_HAS_LINK_SYNCHRONIZED_ATIME 0x08000000 /* report synchronized audio/system time */308#define SNDRV_PCM_INFO_HAS_LINK_SYNCHRONIZED_ATIME 0x08000000 /* report synchronized audio/system time */
302#define SNDRV_PCM_INFO_EXPLICIT_SYNC 0x10000000 /* needs explicit sync of pointers and data */309#define SNDRV_PCM_INFO_EXPLICIT_SYNC 0x10000000 /* needs explicit sync of pointers and data */
303 310#define SNDRV_PCM_INFO_NO_REWINDS 0x20000000 /* hardware can only support monotonic changes of appl_ptr */
304#define SNDRV_PCM_INFO_DRAIN_TRIGGER 0x40000000 /* internal kernel flag - trigger in drain */311#define SNDRV_PCM_INFO_DRAIN_TRIGGER 0x40000000 /* internal kernel flag - trigger in drain */
305#define SNDRV_PCM_INFO_FIFO_IN_FRAMES 0x80000000 /* internal kernel flag - FIFO size is in frames */312#define SNDRV_PCM_INFO_FIFO_IN_FRAMES 0x80000000 /* internal kernel flag - FIFO size is in frames */
306 313