Merge tag 'v6.6-rc5' into locking/core, to pick up fixes

Ingo Molnar committed 3 years ago

Commit fdb8b7a2 parents 0cff993 94f6f05879 files · +9203 −5169Browse files

Showing the changes to include/uapi (3 of 879 files). Show all

Unified · Split

3 files

include/uapi/drm/nouveau_drm.h +10 −0
include/uapi/linux/bpf.h +3 −1
include/uapi/linux/stddef.h +7 −0

include/uapi/drm/nouveau_drm.h+10−0

@@ -44,6 +44,16 @@ extern "C" { · 43 unmodified lines
44	44	#define NOUVEAU_GETPARAM_PTIMER_TIME 14
45	45	#define NOUVEAU_GETPARAM_HAS_BO_USAGE 15
46	46	#define NOUVEAU_GETPARAM_HAS_PAGEFLIP 16
	47	+
	48	+/**
	49	+ * @NOUVEAU_GETPARAM_EXEC_PUSH_MAX
	50	+ *
	51	+ * Query the maximum amount of IBs that can be pushed through a single
	52	+ * &drm_nouveau_exec structure and hence a single &DRM_IOCTL_NOUVEAU_EXEC
	53	+ * ioctl().
	54	+ */
	55	+#define NOUVEAU_GETPARAM_EXEC_PUSH_MAX 17
	56	+
47	57	struct drm_nouveau_getparam {
48	58	__u64 param;
49	59	__u64 value;

include/uapi/linux/bpf.h+3−1

@@ -1962,7 +1962,9 @@ union bpf_attr { · 1961 unmodified lines
1962	1962	* performed again, if the helper is used in combination with
1963	1963	* direct packet access.
1964	1964	* Return
1965		− * 0 on success, or a negative error in case of failure.
	1965	+ * 0 on success, or a negative error in case of failure. Positive
	1966	+ * error indicates a potential drop or congestion in the target
	1967	+ * device. The particular positive error codes are not defined.
1966	1968	*
1967	1969	* u64 bpf_get_current_pid_tgid(void)
1968	1970	* Description

include/uapi/linux/stddef.h+7−0

@@ -29,6 +29,11 @@ · 28 unmodified lines
29	29	struct TAG { MEMBERS } ATTRS NAME; \
30	30	}
31	31
	32	+#ifdef __cplusplus
	33	+/* sizeof(struct{}) is 1 in C++, not 0, can't use C version of the macro. */
	34	+#define __DECLARE_FLEX_ARRAY(T, member) \
	35	+ T member[0]
	36	+#else
32	37	/**
33	38	* __DECLARE_FLEX_ARRAY() - Declare a flexible array usable in a union
34	39	*
@@ -49,3 +54,5 @@ · 14 unmodified lines
49	54	#ifndef __counted_by
50	55	#define __counted_by(m)
51	56	#endif
	57	+
	58	+#endif /* _UAPI_LINUX_STDDEF_H */