History

Backmerge v5.5-rc7 into drm-next

msm needs 5.5-rc4, go to the latest.

Dave Airlie committed 6 years ago

Commit 3d474312 parents df95968 def9d271204 files · +11860 −7137Browse files

Showing the changes to include/uapi/linux (4 of 1204 files). Show all

Unified · Split

4 files
  1. include/uapi/linux/input.h +1 −0
  2. include/uapi/linux/kcov.h +5 −5
  3. include/uapi/linux/netfilter/xt_sctp.h +3 −3
  4. include/uapi/linux/nl80211.h +5 −0
include/uapi/linux/input.h+1−0
@@ -34,6 +34,7 @@ struct input_event { · 33 unmodified lines
34 __kernel_ulong_t __sec;34 __kernel_ulong_t __sec;
35#if defined(__sparc__) && defined(__arch64__)35#if defined(__sparc__) && defined(__arch64__)
36 unsigned int __usec;36 unsigned int __usec;
37 unsigned int __pad;
37#else38#else
38 __kernel_ulong_t __usec;39 __kernel_ulong_t __usec;
39#endif40#endif
include/uapi/linux/kcov.h+5−5
@@ -9,11 +9,11 @@ · 8 unmodified lines
9 * and the comment before kcov_remote_start() for usage details.9 * and the comment before kcov_remote_start() for usage details.
10 */10 */
11struct kcov_remote_arg {11struct kcov_remote_arg {
12 unsigned int trace_mode; /* KCOV_TRACE_PC or KCOV_TRACE_CMP */12 __u32 trace_mode; /* KCOV_TRACE_PC or KCOV_TRACE_CMP */
13 unsigned int area_size; /* Length of coverage buffer in words */13 __u32 area_size; /* Length of coverage buffer in words */
14 unsigned int num_handles; /* Size of handles array */14 __u32 num_handles; /* Size of handles array */
15 __u64 common_handle;15 __aligned_u64 common_handle;
16 __u64 handles[0];16 __aligned_u64 handles[0];
17};17};
18 18
19#define KCOV_REMOTE_MAX_HANDLES 0x10019#define KCOV_REMOTE_MAX_HANDLES 0x100
include/uapi/linux/netfilter/xt_sctp.h+3−3
@@ -41,19 +41,19 @@ struct xt_sctp_info { · 40 unmodified lines
41#define SCTP_CHUNKMAP_SET(chunkmap, type) \41#define SCTP_CHUNKMAP_SET(chunkmap, type) \
42 do { \42 do { \
43 (chunkmap)[type / bytes(__u32)] |= \43 (chunkmap)[type / bytes(__u32)] |= \
44 1 << (type % bytes(__u32)); \44 1u << (type % bytes(__u32)); \
45 } while (0)45 } while (0)
46 46
47#define SCTP_CHUNKMAP_CLEAR(chunkmap, type) \47#define SCTP_CHUNKMAP_CLEAR(chunkmap, type) \
48 do { \48 do { \
49 (chunkmap)[type / bytes(__u32)] &= \49 (chunkmap)[type / bytes(__u32)] &= \
50 ~(1 << (type % bytes(__u32))); \50 ~(1u << (type % bytes(__u32))); \
51 } while (0)51 } while (0)
52 52
53#define SCTP_CHUNKMAP_IS_SET(chunkmap, type) \53#define SCTP_CHUNKMAP_IS_SET(chunkmap, type) \
54({ \54({ \
55 ((chunkmap)[type / bytes (__u32)] & \55 ((chunkmap)[type / bytes (__u32)] & \
56 (1 << (type % bytes (__u32)))) ? 1: 0; \56 (1u << (type % bytes (__u32)))) ? 1: 0; \
57})57})
58 58
59#define SCTP_CHUNKMAP_RESET(chunkmap) \59#define SCTP_CHUNKMAP_RESET(chunkmap) \
include/uapi/linux/nl80211.h+5−0
@@ -5517,6 +5517,10 @@ enum nl80211_feature_flags { · 5516 unmodified lines
5517 * with VLAN tagged frames and separate VLAN-specific netdevs added using5517 * with VLAN tagged frames and separate VLAN-specific netdevs added using
5518 * vconfig similarly to the Ethernet case.5518 * vconfig similarly to the Ethernet case.
5519 *5519 *
5520 * @NL80211_EXT_FEATURE_AQL: The driver supports the Airtime Queue Limit (AQL)
5521 * feature, which prevents bufferbloat by using the expected transmission
5522 * time to limit the amount of data buffered in the hardware.
5523 *
5520 * @NUM_NL80211_EXT_FEATURES: number of extended features.5524 * @NUM_NL80211_EXT_FEATURES: number of extended features.
5521 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.5525 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
5522 */5526 */
@@ -5563,6 +5567,7 @@ enum nl80211_ext_feature_index { · 40 unmodified lines
5563 NL80211_EXT_FEATURE_STA_TX_PWR,5567 NL80211_EXT_FEATURE_STA_TX_PWR,
5564 NL80211_EXT_FEATURE_SAE_OFFLOAD,5568 NL80211_EXT_FEATURE_SAE_OFFLOAD,
5565 NL80211_EXT_FEATURE_VLAN_OFFLOAD,5569 NL80211_EXT_FEATURE_VLAN_OFFLOAD,
5570 NL80211_EXT_FEATURE_AQL,
5566 5571
5567 /* add new features before the definition below */5572 /* add new features before the definition below */
5568 NUM_NL80211_EXT_FEATURES,5573 NUM_NL80211_EXT_FEATURES,