History

Merge branch 'x86/hyperv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Topic branch for stable KVM clockource under Hyper-V. Thanks to Christoffer Dall for resolving the ARM conflict.

Radim Krčmář committed 8 years ago

Commit 7bf14c22 parents 87cedc6 5fa4ec92721 files · +89941 −46712Browse files

Showing the changes to include/uapi/linux (13 of 2721 files). Show all

Unified · Split

13 files
  1. include/uapi/linux/btrfs.h +6 −5
  2. include/uapi/linux/btrfs_tree.h +2 −0
  3. include/uapi/linux/if_ether.h +3 −0
  4. include/uapi/linux/kvm.h +4 −0
  5. include/uapi/linux/libc-compat.h +60 −1
  6. include/uapi/linux/lightnvm.h +9 −0
  7. include/uapi/linux/netfilter/nf_conntrack_common.h +1 −1
  8. include/uapi/linux/nubus.h +0 −23
  9. include/uapi/linux/openvswitch.h +0 −1
  10. include/uapi/linux/perf_event.h +7 −3
  11. include/uapi/linux/pkt_sched.h +0 −1
  12. include/uapi/linux/rtnetlink.h +1 −0
  13. include/uapi/linux/sched.h +5 −0
include/uapi/linux/btrfs.h+6−5
@@ -33,7 +33,12 @@ struct btrfs_ioctl_vol_args { · 32 unmodified lines
3333 char name[BTRFS_PATH_NAME_MAX + 1];
3434 };
3535
36−#define BTRFS_DEVICE_PATH_NAME_MAX 1024
36+#define BTRFS_DEVICE_PATH_NAME_MAX 1024
37+#define BTRFS_SUBVOL_NAME_MAX 4039
38+
39+#define BTRFS_SUBVOL_CREATE_ASYNC (1ULL << 0)
40+#define BTRFS_SUBVOL_RDONLY (1ULL << 1)
41+#define BTRFS_SUBVOL_QGROUP_INHERIT (1ULL << 2)
3742
3843 #define BTRFS_DEVICE_SPEC_BY_ID (1ULL << 3)
3944
@@ -101,11 +106,7 @@ struct btrfs_ioctl_qgroup_limit_args { · 61 unmodified lines
101106 * - BTRFS_IOC_SUBVOL_GETFLAGS
102107 * - BTRFS_IOC_SUBVOL_SETFLAGS
103108 */
104−#define BTRFS_SUBVOL_CREATE_ASYNC (1ULL << 0)
105−#define BTRFS_SUBVOL_RDONLY (1ULL << 1)
106−#define BTRFS_SUBVOL_QGROUP_INHERIT (1ULL << 2)
107109
108−#define BTRFS_SUBVOL_NAME_MAX 4039
109110 struct btrfs_ioctl_vol_args_v2 {
110111 __s64 fd;
111112 __u64 transid;
include/uapi/linux/btrfs_tree.h+2−0
@@ -456,6 +456,8 @@ struct btrfs_free_space_header { · 455 unmodified lines
456456
457457 #define BTRFS_SUPER_FLAG_SEEDING (1ULL << 32)
458458 #define BTRFS_SUPER_FLAG_METADUMP (1ULL << 33)
459+#define BTRFS_SUPER_FLAG_METADUMP_V2 (1ULL << 34)
460+#define BTRFS_SUPER_FLAG_CHANGING_FSID (1ULL << 35)
459461
460462
461463 /*
include/uapi/linux/if_ether.h+3−0
@@ -23,6 +23,7 @@ · 22 unmodified lines
2323 #define _UAPI_LINUX_IF_ETHER_H
2424
2525 #include <linux/types.h>
26+#include <linux/libc-compat.h>
2627
2728 /*
2829 * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
@@ -149,11 +150,13 @@ · 120 unmodified lines
149150 * This is an Ethernet frame header.
150151 */
151152
153+#if __UAPI_DEF_ETHHDR
152154 struct ethhdr {
153155 unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
154156 unsigned char h_source[ETH_ALEN]; /* source ether addr */
155157 __be16 h_proto; /* packet type ID field */
156158 } __attribute__((packed));
159+#endif
157160
158161
159162 #endif /* _UAPI_LINUX_IF_ETHER_H */
include/uapi/linux/kvm.h+4−0
@@ -932,6 +932,8 @@ struct kvm_ppc_resize_hpt { · 931 unmodified lines
932932 #define KVM_CAP_HYPERV_SYNIC2 148
933933 #define KVM_CAP_HYPERV_VP_INDEX 149
934934 #define KVM_CAP_S390_AIS_MIGRATION 150
935+#define KVM_CAP_PPC_GET_CPU_CHAR 151
936+#define KVM_CAP_S390_BPB 152
935937
936938 #ifdef KVM_CAP_IRQ_ROUTING
937939
@@ -1261,6 +1263,8 @@ struct kvm_s390_ucas_mapping { · 323 unmodified lines
12611263 #define KVM_PPC_CONFIGURE_V3_MMU _IOW(KVMIO, 0xaf, struct kvm_ppc_mmuv3_cfg)
12621264 /* Available with KVM_CAP_PPC_RADIX_MMU */
12631265 #define KVM_PPC_GET_RMMU_INFO _IOW(KVMIO, 0xb0, struct kvm_ppc_rmmu_info)
1266+/* Available with KVM_CAP_PPC_GET_CPU_CHAR */
1267+#define KVM_PPC_GET_CPU_CHAR _IOR(KVMIO, 0xb1, struct kvm_ppc_cpu_char)
12641268
12651269 /* ioctl for vm fd */
12661270 #define KVM_CREATE_DEVICE _IOWR(KVMIO, 0xe0, struct kvm_create_device)
include/uapi/linux/libc-compat.h+60−1
@@ -168,47 +168,106 @@ · 167 unmodified lines
168168
169169 /* If we did not see any headers from any supported C libraries,
170170 * or we are being included in the kernel, then define everything
171− * that we need. */
171+ * that we need. Check for previous __UAPI_* definitions to give
172+ * unsupported C libraries a way to opt out of any kernel definition. */
172173 #else /* !defined(__GLIBC__) */
173174
174175 /* Definitions for if.h */
176+#ifndef __UAPI_DEF_IF_IFCONF
175177 #define __UAPI_DEF_IF_IFCONF 1
178+#endif
179+#ifndef __UAPI_DEF_IF_IFMAP
176180 #define __UAPI_DEF_IF_IFMAP 1
181+#endif
182+#ifndef __UAPI_DEF_IF_IFNAMSIZ
177183 #define __UAPI_DEF_IF_IFNAMSIZ 1
184+#endif
185+#ifndef __UAPI_DEF_IF_IFREQ
178186 #define __UAPI_DEF_IF_IFREQ 1
187+#endif
179188 /* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
189+#ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS
180190 #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1
191+#endif
181192 /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
193+#ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
182194 #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
195+#endif
183196
184197 /* Definitions for in.h */
198+#ifndef __UAPI_DEF_IN_ADDR
185199 #define __UAPI_DEF_IN_ADDR 1
200+#endif
201+#ifndef __UAPI_DEF_IN_IPPROTO
186202 #define __UAPI_DEF_IN_IPPROTO 1
203+#endif
204+#ifndef __UAPI_DEF_IN_PKTINFO
187205 #define __UAPI_DEF_IN_PKTINFO 1
206+#endif
207+#ifndef __UAPI_DEF_IP_MREQ
188208 #define __UAPI_DEF_IP_MREQ 1
209+#endif
210+#ifndef __UAPI_DEF_SOCKADDR_IN
189211 #define __UAPI_DEF_SOCKADDR_IN 1
212+#endif
213+#ifndef __UAPI_DEF_IN_CLASS
190214 #define __UAPI_DEF_IN_CLASS 1
215+#endif
191216
192217 /* Definitions for in6.h */
218+#ifndef __UAPI_DEF_IN6_ADDR
193219 #define __UAPI_DEF_IN6_ADDR 1
220+#endif
221+#ifndef __UAPI_DEF_IN6_ADDR_ALT
194222 #define __UAPI_DEF_IN6_ADDR_ALT 1
223+#endif
224+#ifndef __UAPI_DEF_SOCKADDR_IN6
195225 #define __UAPI_DEF_SOCKADDR_IN6 1
226+#endif
227+#ifndef __UAPI_DEF_IPV6_MREQ
196228 #define __UAPI_DEF_IPV6_MREQ 1
229+#endif
230+#ifndef __UAPI_DEF_IPPROTO_V6
197231 #define __UAPI_DEF_IPPROTO_V6 1
232+#endif
233+#ifndef __UAPI_DEF_IPV6_OPTIONS
198234 #define __UAPI_DEF_IPV6_OPTIONS 1
235+#endif
236+#ifndef __UAPI_DEF_IN6_PKTINFO
199237 #define __UAPI_DEF_IN6_PKTINFO 1
238+#endif
239+#ifndef __UAPI_DEF_IP6_MTUINFO
200240 #define __UAPI_DEF_IP6_MTUINFO 1
241+#endif
201242
202243 /* Definitions for ipx.h */
244+#ifndef __UAPI_DEF_SOCKADDR_IPX
203245 #define __UAPI_DEF_SOCKADDR_IPX 1
246+#endif
247+#ifndef __UAPI_DEF_IPX_ROUTE_DEFINITION
204248 #define __UAPI_DEF_IPX_ROUTE_DEFINITION 1
249+#endif
250+#ifndef __UAPI_DEF_IPX_INTERFACE_DEFINITION
205251 #define __UAPI_DEF_IPX_INTERFACE_DEFINITION 1
252+#endif
253+#ifndef __UAPI_DEF_IPX_CONFIG_DATA
206254 #define __UAPI_DEF_IPX_CONFIG_DATA 1
255+#endif
256+#ifndef __UAPI_DEF_IPX_ROUTE_DEF
207257 #define __UAPI_DEF_IPX_ROUTE_DEF 1
258+#endif
208259
209260 /* Definitions for xattr.h */
261+#ifndef __UAPI_DEF_XATTR
210262 #define __UAPI_DEF_XATTR 1
263+#endif
211264
212265 #endif /* __GLIBC__ */
213266
267+/* Definitions for if_ether.h */
268+/* allow libcs like musl to deactivate this, glibc does not implement this. */
269+#ifndef __UAPI_DEF_ETHHDR
270+#define __UAPI_DEF_ETHHDR 1
271+#endif
272+
214273 #endif /* _UAPI_LIBC_COMPAT_H */
include/uapi/linux/lightnvm.h+9−0
@@ -75,14 +75,23 @@ struct nvm_ioctl_create_simple { · 74 unmodified lines
7575 __u32 lun_end;
7676 };
7777
78+struct nvm_ioctl_create_extended {
79+ __u16 lun_begin;
80+ __u16 lun_end;
81+ __u16 op;
82+ __u16 rsv;
83+};
84+
7885 enum {
7986 NVM_CONFIG_TYPE_SIMPLE = 0,
87+ NVM_CONFIG_TYPE_EXTENDED = 1,
8088 };
8189
8290 struct nvm_ioctl_create_conf {
8391 __u32 type;
8492 union {
8593 struct nvm_ioctl_create_simple s;
94+ struct nvm_ioctl_create_extended e;
8695 };
8796 };
8897
include/uapi/linux/netfilter/nf_conntrack_common.h+1−1
@@ -36,7 +36,7 @@ enum ip_conntrack_info { · 35 unmodified lines
3636
3737 #define NF_CT_STATE_INVALID_BIT (1 << 0)
3838 #define NF_CT_STATE_BIT(ctinfo) (1 << ((ctinfo) % IP_CT_IS_REPLY + 1))
39−#define NF_CT_STATE_UNTRACKED_BIT (1 << (IP_CT_UNTRACKED + 1))
39+#define NF_CT_STATE_UNTRACKED_BIT (1 << 6)
4040
4141 /* Bitset representing status of connection. */
4242 enum ip_conntrack_status {
include/uapi/linux/nubus.h+0−23
@@ -221,27 +221,4 @@ enum nubus_display_res_id { · 220 unmodified lines
221221 NUBUS_RESID_SIXTHMODE = 0x0085
222222 };
223223
224−struct nubus_dir
225−{
226− unsigned char *base;
227− unsigned char *ptr;
228− int done;
229− int mask;
230−};
231−
232−struct nubus_dirent
233−{
234− unsigned char *base;
235− unsigned char type;
236− __u32 data; /* Actually 24bits used */
237− int mask;
238−};
239−
240−
241−/* We'd like to get rid of this eventually. Only daynaport.c uses it now. */
242−static inline void *nubus_slot_addr(int slot)
243−{
244− return (void *)(0xF0000000|(slot<<24));
245−}
246−
247224 #endif /* _UAPILINUX_NUBUS_H */
include/uapi/linux/openvswitch.h+0−1
@@ -363,7 +363,6 @@ enum ovs_tunnel_key_attr { · 362 unmodified lines
363363 OVS_TUNNEL_KEY_ATTR_IPV6_SRC, /* struct in6_addr src IPv6 address. */
364364 OVS_TUNNEL_KEY_ATTR_IPV6_DST, /* struct in6_addr dst IPv6 address. */
365365 OVS_TUNNEL_KEY_ATTR_PAD,
366− OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS, /* be32 ERSPAN index. */
367366 __OVS_TUNNEL_KEY_ATTR_MAX
368367 };
369368
include/uapi/linux/perf_event.h+7−3
@@ -612,9 +612,12 @@ struct perf_event_mmap_page { · 611 unmodified lines
612612 */
613613 #define PERF_RECORD_MISC_PROC_MAP_PARSE_TIMEOUT (1 << 12)
614614 /*
615− * PERF_RECORD_MISC_MMAP_DATA and PERF_RECORD_MISC_COMM_EXEC are used on
616− * different events so can reuse the same bit position.
617− * Ditto PERF_RECORD_MISC_SWITCH_OUT.
615+ * Following PERF_RECORD_MISC_* are used on different
616+ * events, so can reuse the same bit position:
617+ *
618+ * PERF_RECORD_MISC_MMAP_DATA - PERF_RECORD_MMAP* events
619+ * PERF_RECORD_MISC_COMM_EXEC - PERF_RECORD_COMM event
620+ * PERF_RECORD_MISC_SWITCH_OUT - PERF_RECORD_SWITCH* events
618621 */
619622 #define PERF_RECORD_MISC_MMAP_DATA (1 << 13)
620623 #define PERF_RECORD_MISC_COMM_EXEC (1 << 13)
@@ -864,6 +867,7 @@ enum perf_event_type { · 243 unmodified lines
864867 * struct perf_event_header header;
865868 * u32 pid;
866869 * u32 tid;
870+ * struct sample_id sample_id;
867871 * };
868872 */
869873 PERF_RECORD_ITRACE_START = 12,
include/uapi/linux/pkt_sched.h+0−1
@@ -256,7 +256,6 @@ struct tc_red_qopt { · 255 unmodified lines
256256 #define TC_RED_ECN 1
257257 #define TC_RED_HARDDROP 2
258258 #define TC_RED_ADAPTATIVE 4
259−#define TC_RED_OFFLOADED 8
260259 };
261260
262261 struct tc_red_xstats {
include/uapi/linux/rtnetlink.h+1−0
@@ -557,6 +557,7 @@ enum { · 556 unmodified lines
557557 TCA_PAD,
558558 TCA_DUMP_INVISIBLE,
559559 TCA_CHAIN,
560+ TCA_HW_OFFLOAD,
560561 __TCA_MAX
561562 };
562563
include/uapi/linux/sched.h+5−0
@@ -49,5 +49,10 @@ · 48 unmodified lines
4949 */
5050 #define SCHED_FLAG_RESET_ON_FORK 0x01
5151 #define SCHED_FLAG_RECLAIM 0x02
52+#define SCHED_FLAG_DL_OVERRUN 0x04
53+
54+#define SCHED_FLAG_ALL (SCHED_FLAG_RESET_ON_FORK | \
55+ SCHED_FLAG_RECLAIM | \
56+ SCHED_FLAG_DL_OVERRUN)
5257
5358 #endif /* _UAPI_LINUX_SCHED_H */