Merge tag 'noinstr-x86-kvm-2020-05-16' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into HEAD

Paolo Bonzini committed 6 years ago

Commit 9d5272f2 parents febd668 3a7c8fa868 files · +8779 −4517Browse files

Showing the changes to include/uapi/linux (10 of 868 files). Show all

Unified · Split

10 files

@@ -73,7 +73,7 @@ struct bpf_insn { · 72 unmodified lines
73	73	/* Key of an a BPF_MAP_TYPE_LPM_TRIE entry */
74	74	struct bpf_lpm_trie_key {
75	75	__u32 prefixlen; /* up to 32 for AF_INET, 128 for AF_INET6 */
76		− __u8 data[]; /* Arbitrary size */
	76	+ __u8 data[0]; /* Arbitrary size */
77	77	};
78	78
79	79	struct bpf_cgroup_storage_key {
@@ -1642,7 +1642,7 @@ union bpf_attr { · 1562 unmodified lines
1642	1642	* ifindex, but doesn't require a map to do so.
1643	1643	* Return
1644	1644	* XDP_REDIRECT on success, or the value of the two lower bits
1645		− * of the *flags argument on error.
	1645	+ * of the flags argument on error.
1646	1646	*
1647	1647	* int bpf_sk_redirect_map(struct sk_buff skb, struct bpf_map map, u32 key, u64 flags)
1648	1648	* Description

@@ -45,13 +45,13 @@ struct dlm_lock_params { · 44 unmodified lines
45	45	void __user *bastaddr;
46	46	struct dlm_lksb __user *lksb;
47	47	char lvb[DLM_USER_LVB_LEN];
48		− char name[];
	48	+ char name[0];
49	49	};
50	50
51	51	struct dlm_lspace_params {
52	52	__u32 flags;
53	53	__u32 minor;
54		− char name[];
	54	+ char name[0];
55	55	};
56	56
57	57	struct dlm_purge_params {

@@ -39,6 +39,12 @@ struct dma_buf_sync { · 38 unmodified lines
39	39
40	40	#define DMA_BUF_BASE 'b'
41	41	#define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync)
	42	+
	43	+/* 32/64bitness of this uapi was botched in android, there's no difference
	44	+ * between them in actual uapi, they're just different numbers.
	45	+ */
42	46	#define DMA_BUF_SET_NAME _IOW(DMA_BUF_BASE, 1, const char *)
	47	+#define DMA_BUF_SET_NAME_A _IOW(DMA_BUF_BASE, 1, u32)
	48	+#define DMA_BUF_SET_NAME_B _IOW(DMA_BUF_BASE, 1, u64)
43	49
44	50	#endif

@@ -34,7 +34,7 @@ struct fiemap { · 33 unmodified lines
34	34	__u32 fm_mapped_extents;/* number of extents that were mapped (out) */
35	35	__u32 fm_extent_count; /* size of fm_extents array (in) */
36	36	__u32 fm_reserved;
37		− struct fiemap_extent fm_extents[]; /* array of mapped extents (out) */
	37	+ struct fiemap_extent fm_extents[0]; /* array of mapped extents (out) */
38	38	};
39	39
40	40	#define FIEMAP_MAX_OFFSET (~0ULL)

@@ -119,8 +119,8 @@ enum hv_fcopy_op { · 118 unmodified lines
119	119
120	120	struct hv_fcopy_hdr {
121	121	__u32 operation;
122		− uuid_le service_id0; /* currently unused */
123		− uuid_le service_id1; /* currently unused */
	122	+ __u8 service_id0[16]; /* currently unused */
	123	+ __u8 service_id1[16]; /* currently unused */
124	124	} __attribute__((packed));
125	125
126	126	#define OVER_WRITE 0x1

@@ -60,7 +60,7 @@ struct arc_rfc1201 { · 59 unmodified lines
60	60	__u8 proto; /* protocol ID field - varies */
61	61	__u8 split_flag; /* for use with split packets */
62	62	__be16 sequence; /* sequence number */
63		− __u8 payload[]; /* space remaining in packet (504 bytes)*/
	63	+ __u8 payload[0]; /* space remaining in packet (504 bytes)*/
64	64	};
65	65	#define RFC1201_HDR_SIZE 4
66	66
@@ -69,7 +69,7 @@ struct arc_rfc1201 { · 2 unmodified lines
69	69	*/
70	70	struct arc_rfc1051 {
71	71	__u8 proto; /* ARC_P_RFC1051_ARP/RFC1051_IP */
72		− __u8 payload[]; /* 507 bytes */
	72	+ __u8 payload[0]; /* 507 bytes */
73	73	};
74	74	#define RFC1051_HDR_SIZE 1
75	75
@@ -80,7 +80,7 @@ struct arc_rfc1051 { · 4 unmodified lines
80	80	struct arc_eth_encap {
81	81	__u8 proto; /* Always ARC_P_ETHER */
82	82	struct ethhdr eth; /* standard ethernet header (yuck!) */
83		− __u8 payload[]; /* 493 bytes */
	83	+ __u8 payload[0]; /* 493 bytes */
84	84	};
85	85	#define ETH_ENCAP_HDR_SIZE 14
86	86

@@ -57,7 +57,7 @@ struct mmc_ioc_cmd { · 56 unmodified lines
57	57	*/
58	58	struct mmc_ioc_multi_cmd {
59	59	__u64 num_of_cmds;
60		− struct mmc_ioc_cmd cmds[];
	60	+ struct mmc_ioc_cmd cmds[0];
61	61	};
62	62
63	63	#define MMC_IOC_CMD _IOWR(MMC_BLOCK_MAJOR, 0, struct mmc_ioc_cmd)

@@ -29,12 +29,12 @@ struct net_dm_config_entry { · 28 unmodified lines
29	29
30	30	struct net_dm_config_msg {
31	31	__u32 entries;
32		− struct net_dm_config_entry options[];
	32	+ struct net_dm_config_entry options[0];
33	33	};
34	34
35	35	struct net_dm_alert_msg {
36	36	__u32 entries;
37		− struct net_dm_drop_point points[];
	37	+ struct net_dm_drop_point points[0];
38	38	};
39	39
40	40	struct net_dm_user_msg {

@@ -40,7 +40,7 @@ struct ebt_mac_wormhash_tuple { · 39 unmodified lines
40	40	struct ebt_mac_wormhash {
41	41	int table[257];
42	42	int poolsize;
43		− struct ebt_mac_wormhash_tuple pool[];
	43	+ struct ebt_mac_wormhash_tuple pool[0];
44	44	};
45	45
46	46	#define ebt_mac_wormhash_size(x) ((x) ? sizeof(struct ebt_mac_wormhash) \

@@ -48,8 +48,15 @@ struct virtio_balloon_config { · 47 unmodified lines
48	48	__u32 num_pages;
49	49	/* Number of pages we've actually got in balloon. */
50	50	__u32 actual;
51		− /* Free page report command id, readonly by guest */
52		− __u32 free_page_report_cmd_id;
	51	+ /*
	52	+ * Free page hint command id, readonly by guest.
	53	+ * Was previously named free_page_report_cmd_id so we
	54	+ * need to carry that name for legacy support.
	55	+ */
	56	+ union {
	57	+ __u32 free_page_hint_cmd_id;
	58	+ __u32 free_page_report_cmd_id; /* deprecated */
	59	+ };
53	60	/* Stores PAGE_POISON if page poisoning is in use */
54	61	__u32 poison_val;
55	62	};