Linux 4.8-rc8 There was a lot of fallout in the imx/amdgpu/i915 drivers, so backmerge it now to avoid troubles. * tag 'v4.8-rc8': (1442 commits) Linux 4.8-rc8 fault_in_multipages_readable() throws set-but-unused error mm: check VMA flags to avoid invalid PROT_NONE NUMA balancing radix tree: fix sibling entry handling in radix_tree_descend() radix tree test suite: Test radix_tree_replace_slot() for multiorder entries fix memory leaks in tracing_buffers_splice_read() tracing: Move mutex to protect against resetting of seq data MIPS: Fix delay slot emulation count in debugfs MIPS: SMP: Fix possibility of deadlock when bringing CPUs online mm: delete unnecessary and unsafe init_tlb_ubc() huge tmpfs: fix Committed_AS leak shmem: fix tmpfs to handle the huge= option properly blk-mq: skip unmapped queues in blk_mq_alloc_request_hctx MIPS: Fix pre-r6 emulation FPU initialisation arm64: kgdb: handle read-only text / modules arm64: Call numa_store_cpu_info() earlier. locking/hung_task: Fix typo in CONFIG_DETECT_HUNG_TASK help text nvme-rdma: only clear queue flags after successful connect i2c: qup: skip qup_i2c_suspend if the device is already runtime suspended perf/core: Limit matching exclusive events to one PMU ...
Showing the changes to include/uapi (10 of 1280 files). Show all
Unified · Split
| @@ -14,6 +14,7 @@ · 13 unmodified lines | ||
| 14 | 14 | |
| 15 | 15 | #include <linux/atmapi.h> |
| 16 | 16 | #include <linux/atmioc.h> |
| 17 | +#include <linux/time.h> | |
| 17 | 18 | |
| 18 | 19 | #define ZATM_GETPOOL _IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc) |
| 19 | 20 | /* get pool statistics */ |
| @@ -339,7 +339,7 @@ enum bpf_func_id { · 338 unmodified lines | ||
| 339 | 339 | BPF_FUNC_skb_change_type, |
| 340 | 340 | |
| 341 | 341 | /** |
| 342 | − * bpf_skb_in_cgroup(skb, map, index) - Check cgroup2 membership of skb | |
| 342 | + * bpf_skb_under_cgroup(skb, map, index) - Check cgroup2 membership of skb | |
| 343 | 343 | * @skb: pointer to skb |
| 344 | 344 | * @map: pointer to bpf_map in BPF_MAP_TYPE_CGROUP_ARRAY type |
| 345 | 345 | * @index: index of the cgroup in the bpf_map |
| @@ -348,7 +348,7 @@ enum bpf_func_id { · 2 unmodified lines | ||
| 348 | 348 | * == 1 skb succeeded the cgroup2 descendant test |
| 349 | 349 | * < 0 error |
| 350 | 350 | */ |
| 351 | − BPF_FUNC_skb_in_cgroup, | |
| 351 | + BPF_FUNC_skb_under_cgroup, | |
| 352 | 352 | |
| 353 | 353 | /** |
| 354 | 354 | * bpf_get_hash_recalc(skb) |
| @@ -16,7 +16,8 @@ · 15 unmodified lines | ||
| 16 | 16 | #define _UAPI__LINUX_IF_PPPOL2TP_H |
| 17 | 17 | |
| 18 | 18 | #include <linux/types.h> |
| 19 | − | |
| 19 | +#include <linux/in.h> | |
| 20 | +#include <linux/in6.h> | |
| 20 | 21 | |
| 21 | 22 | /* Structure used to connect() the socket to a particular tunnel UDP |
| 22 | 23 | * socket over IPv4. |
| @@ -21,8 +21,11 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <asm/byteorder.h> |
| 22 | 22 | |
| 23 | 23 | #include <linux/socket.h> |
| 24 | +#include <linux/if.h> | |
| 24 | 25 | #include <linux/if_ether.h> |
| 25 | 26 | #include <linux/if_pppol2tp.h> |
| 27 | +#include <linux/in.h> | |
| 28 | +#include <linux/in6.h> | |
| 26 | 29 | |
| 27 | 30 | /* For user-space programs to pick up these definitions |
| 28 | 31 | * which they wouldn't get otherwise without defining __KERNEL__ |
| @@ -2,6 +2,9 @@ · 1 unmodified line | ||
| 2 | 2 | #define _UAPI_IF_TUNNEL_H_ |
| 3 | 3 | |
| 4 | 4 | #include <linux/types.h> |
| 5 | +#include <linux/if.h> | |
| 6 | +#include <linux/ip.h> | |
| 7 | +#include <linux/in6.h> | |
| 5 | 8 | #include <asm/byteorder.h> |
| 6 | 9 | |
| 7 | 10 | |
| @@ -1,11 +1,13 @@ | ||
| 1 | 1 | #ifndef _IPX_H_ |
| 2 | 2 | #define _IPX_H_ |
| 3 | +#include <linux/libc-compat.h> /* for compatibility with glibc netipx/ipx.h */ | |
| 3 | 4 | #include <linux/types.h> |
| 4 | 5 | #include <linux/sockios.h> |
| 5 | 6 | #include <linux/socket.h> |
| 6 | 7 | #define IPX_NODE_LEN 6 |
| 7 | 8 | #define IPX_MTU 576 |
| 8 | 9 | |
| 10 | +#if __UAPI_DEF_SOCKADDR_IPX | |
| 9 | 11 | struct sockaddr_ipx { |
| 10 | 12 | __kernel_sa_family_t sipx_family; |
| 11 | 13 | __be16 sipx_port; |
| @@ -14,6 +16,7 @@ struct sockaddr_ipx { · 2 unmodified lines | ||
| 14 | 16 | __u8 sipx_type; |
| 15 | 17 | unsigned char sipx_zero; /* 16 byte fill */ |
| 16 | 18 | }; |
| 19 | +#endif /* __UAPI_DEF_SOCKADDR_IPX */ | |
| 17 | 20 | |
| 18 | 21 | /* |
| 19 | 22 | * So we can fit the extra info for SIOCSIFADDR into the address nicely |
| @@ -23,12 +26,15 @@ struct sockaddr_ipx { · 3 unmodified lines | ||
| 23 | 26 | #define IPX_DLTITF 0 |
| 24 | 27 | #define IPX_CRTITF 1 |
| 25 | 28 | |
| 29 | +#if __UAPI_DEF_IPX_ROUTE_DEFINITION | |
| 26 | 30 | struct ipx_route_definition { |
| 27 | 31 | __be32 ipx_network; |
| 28 | 32 | __be32 ipx_router_network; |
| 29 | 33 | unsigned char ipx_router_node[IPX_NODE_LEN]; |
| 30 | 34 | }; |
| 35 | +#endif /* __UAPI_DEF_IPX_ROUTE_DEFINITION */ | |
| 31 | 36 | |
| 37 | +#if __UAPI_DEF_IPX_INTERFACE_DEFINITION | |
| 32 | 38 | struct ipx_interface_definition { |
| 33 | 39 | __be32 ipx_network; |
| 34 | 40 | unsigned char ipx_device[16]; |
| @@ -45,16 +51,20 @@ struct ipx_interface_definition { · 10 unmodified lines | ||
| 45 | 51 | #define IPX_INTERNAL 2 |
| 46 | 52 | unsigned char ipx_node[IPX_NODE_LEN]; |
| 47 | 53 | }; |
| 48 | − | |
| 54 | +#endif /* __UAPI_DEF_IPX_INTERFACE_DEFINITION */ | |
| 55 | + | |
| 56 | +#if __UAPI_DEF_IPX_CONFIG_DATA | |
| 49 | 57 | struct ipx_config_data { |
| 50 | 58 | unsigned char ipxcfg_auto_select_primary; |
| 51 | 59 | unsigned char ipxcfg_auto_create_interfaces; |
| 52 | 60 | }; |
| 61 | +#endif /* __UAPI_DEF_IPX_CONFIG_DATA */ | |
| 53 | 62 | |
| 54 | 63 | /* |
| 55 | 64 | * OLD Route Definition for backward compatibility. |
| 56 | 65 | */ |
| 57 | 66 | |
| 67 | +#if __UAPI_DEF_IPX_ROUTE_DEF | |
| 58 | 68 | struct ipx_route_def { |
| 59 | 69 | __be32 ipx_network; |
| 60 | 70 | __be32 ipx_router_network; |
| @@ -67,6 +77,7 @@ struct ipx_route_def { · 6 unmodified lines | ||
| 67 | 77 | #define IPX_RT_BLUEBOOK 2 |
| 68 | 78 | #define IPX_RT_ROUTED 1 |
| 69 | 79 | }; |
| 80 | +#endif /* __UAPI_DEF_IPX_ROUTE_DEF */ | |
| 70 | 81 | |
| 71 | 82 | #define SIOCAIPXITFCRT (SIOCPROTOPRIVATE) |
| 72 | 83 | #define SIOCAIPXPRISLT (SIOCPROTOPRIVATE + 1) |
| @@ -139,6 +139,25 @@ · 138 unmodified lines | ||
| 139 | 139 | |
| 140 | 140 | #endif /* _NETINET_IN_H */ |
| 141 | 141 | |
| 142 | +/* Coordinate with glibc netipx/ipx.h header. */ | |
| 143 | +#if defined(__NETIPX_IPX_H) | |
| 144 | + | |
| 145 | +#define __UAPI_DEF_SOCKADDR_IPX 0 | |
| 146 | +#define __UAPI_DEF_IPX_ROUTE_DEFINITION 0 | |
| 147 | +#define __UAPI_DEF_IPX_INTERFACE_DEFINITION 0 | |
| 148 | +#define __UAPI_DEF_IPX_CONFIG_DATA 0 | |
| 149 | +#define __UAPI_DEF_IPX_ROUTE_DEF 0 | |
| 150 | + | |
| 151 | +#else /* defined(__NETIPX_IPX_H) */ | |
| 152 | + | |
| 153 | +#define __UAPI_DEF_SOCKADDR_IPX 1 | |
| 154 | +#define __UAPI_DEF_IPX_ROUTE_DEFINITION 1 | |
| 155 | +#define __UAPI_DEF_IPX_INTERFACE_DEFINITION 1 | |
| 156 | +#define __UAPI_DEF_IPX_CONFIG_DATA 1 | |
| 157 | +#define __UAPI_DEF_IPX_ROUTE_DEF 1 | |
| 158 | + | |
| 159 | +#endif /* defined(__NETIPX_IPX_H) */ | |
| 160 | + | |
| 142 | 161 | /* Definitions for xattr.h */ |
| 143 | 162 | #if defined(_SYS_XATTR_H) |
| 144 | 163 | #define __UAPI_DEF_XATTR 0 |
| @@ -179,6 +198,13 @@ · 34 unmodified lines | ||
| 179 | 198 | #define __UAPI_DEF_IN6_PKTINFO 1 |
| 180 | 199 | #define __UAPI_DEF_IP6_MTUINFO 1 |
| 181 | 200 | |
| 201 | +/* Definitions for ipx.h */ | |
| 202 | +#define __UAPI_DEF_SOCKADDR_IPX 1 | |
| 203 | +#define __UAPI_DEF_IPX_ROUTE_DEFINITION 1 | |
| 204 | +#define __UAPI_DEF_IPX_INTERFACE_DEFINITION 1 | |
| 205 | +#define __UAPI_DEF_IPX_CONFIG_DATA 1 | |
| 206 | +#define __UAPI_DEF_IPX_ROUTE_DEF 1 | |
| 207 | + | |
| 182 | 208 | /* Definitions for xattr.h */ |
| 183 | 209 | #define __UAPI_DEF_XATTR 1 |
| 184 | 210 | |
| @@ -24,7 +24,7 @@ enum nft_registers { · 23 unmodified lines | ||
| 24 | 24 | __NFT_REG_MAX, |
| 25 | 25 | |
| 26 | 26 | NFT_REG32_00 = 8, |
| 27 | − MFT_REG32_01, | |
| 27 | + NFT_REG32_01, | |
| 28 | 28 | NFT_REG32_02, |
| 29 | 29 | NFT_REG32_03, |
| 30 | 30 | NFT_REG32_04, |
| @@ -583,7 +583,7 @@ enum ovs_userspace_attr { · 582 unmodified lines | ||
| 583 | 583 | #define OVS_USERSPACE_ATTR_MAX (__OVS_USERSPACE_ATTR_MAX - 1) |
| 584 | 584 | |
| 585 | 585 | struct ovs_action_trunc { |
| 586 | − uint32_t max_len; /* Max packet size in bytes. */ | |
| 586 | + __u32 max_len; /* Max packet size in bytes. */ | |
| 587 | 587 | }; |
| 588 | 588 | |
| 589 | 589 | /** |
| @@ -632,8 +632,8 @@ enum ovs_hash_alg { · 42 unmodified lines | ||
| 632 | 632 | * @hash_basis: basis used for computing hash. |
| 633 | 633 | */ |
| 634 | 634 | struct ovs_action_hash { |
| 635 | − uint32_t hash_alg; /* One of ovs_hash_alg. */ | |
| 636 | − uint32_t hash_basis; | |
| 635 | + __u32 hash_alg; /* One of ovs_hash_alg. */ | |
| 636 | + __u32 hash_basis; | |
| 637 | 637 | }; |
| 638 | 638 | |
| 639 | 639 | /** |
| @@ -944,4 +944,68 @@ struct sctp_default_prinfo { · 943 unmodified lines | ||
| 944 | 944 | __u16 pr_policy; |
| 945 | 945 | }; |
| 946 | 946 | |
| 947 | +struct sctp_info { | |
| 948 | + __u32 sctpi_tag; | |
| 949 | + __u32 sctpi_state; | |
| 950 | + __u32 sctpi_rwnd; | |
| 951 | + __u16 sctpi_unackdata; | |
| 952 | + __u16 sctpi_penddata; | |
| 953 | + __u16 sctpi_instrms; | |
| 954 | + __u16 sctpi_outstrms; | |
| 955 | + __u32 sctpi_fragmentation_point; | |
| 956 | + __u32 sctpi_inqueue; | |
| 957 | + __u32 sctpi_outqueue; | |
| 958 | + __u32 sctpi_overall_error; | |
| 959 | + __u32 sctpi_max_burst; | |
| 960 | + __u32 sctpi_maxseg; | |
| 961 | + __u32 sctpi_peer_rwnd; | |
| 962 | + __u32 sctpi_peer_tag; | |
| 963 | + __u8 sctpi_peer_capable; | |
| 964 | + __u8 sctpi_peer_sack; | |
| 965 | + __u16 __reserved1; | |
| 966 | + | |
| 967 | + /* assoc status info */ | |
| 968 | + __u64 sctpi_isacks; | |
| 969 | + __u64 sctpi_osacks; | |
| 970 | + __u64 sctpi_opackets; | |
| 971 | + __u64 sctpi_ipackets; | |
| 972 | + __u64 sctpi_rtxchunks; | |
| 973 | + __u64 sctpi_outofseqtsns; | |
| 974 | + __u64 sctpi_idupchunks; | |
| 975 | + __u64 sctpi_gapcnt; | |
| 976 | + __u64 sctpi_ouodchunks; | |
| 977 | + __u64 sctpi_iuodchunks; | |
| 978 | + __u64 sctpi_oodchunks; | |
| 979 | + __u64 sctpi_iodchunks; | |
| 980 | + __u64 sctpi_octrlchunks; | |
| 981 | + __u64 sctpi_ictrlchunks; | |
| 982 | + | |
| 983 | + /* primary transport info */ | |
| 984 | + struct sockaddr_storage sctpi_p_address; | |
| 985 | + __s32 sctpi_p_state; | |
| 986 | + __u32 sctpi_p_cwnd; | |
| 987 | + __u32 sctpi_p_srtt; | |
| 988 | + __u32 sctpi_p_rto; | |
| 989 | + __u32 sctpi_p_hbinterval; | |
| 990 | + __u32 sctpi_p_pathmaxrxt; | |
| 991 | + __u32 sctpi_p_sackdelay; | |
| 992 | + __u32 sctpi_p_sackfreq; | |
| 993 | + __u32 sctpi_p_ssthresh; | |
| 994 | + __u32 sctpi_p_partial_bytes_acked; | |
| 995 | + __u32 sctpi_p_flight_size; | |
| 996 | + __u16 sctpi_p_error; | |
| 997 | + __u16 __reserved2; | |
| 998 | + | |
| 999 | + /* sctp sock info */ | |
| 1000 | + __u32 sctpi_s_autoclose; | |
| 1001 | + __u32 sctpi_s_adaptation_ind; | |
| 1002 | + __u32 sctpi_s_pd_point; | |
| 1003 | + __u8 sctpi_s_nodelay; | |
| 1004 | + __u8 sctpi_s_disable_fragments; | |
| 1005 | + __u8 sctpi_s_v4mapped; | |
| 1006 | + __u8 sctpi_s_frag_interleave; | |
| 1007 | + __u32 sctpi_s_type; | |
| 1008 | + __u32 __reserved3; | |
| 1009 | +}; | |
| 1010 | + | |
| 947 | 1011 | #endif /* _UAPI_SCTP_H */ |