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

@@ -44,6 +44,16 @@ extern "C" { · 43 unmodified lines
44	#define NOUVEAU_GETPARAM_PTIMER_TIME 14	44	#define NOUVEAU_GETPARAM_PTIMER_TIME 14
45	#define NOUVEAU_GETPARAM_HAS_BO_USAGE 15	45	#define NOUVEAU_GETPARAM_HAS_BO_USAGE 15
46	#define NOUVEAU_GETPARAM_HAS_PAGEFLIP 16	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	struct drm_nouveau_getparam {	57	struct drm_nouveau_getparam {
48	__u64 param;	58	__u64 param;
49	__u64 value;	59	__u64 value;

  * 		performed again, if the helper is used in combination with
  * 		direct packet access.
  * 	Return
- * 		0 on success, or a negative error in case of failure.
+ * 		0 on success, or a negative error in case of failure. Positive
+ * 		error indicates a potential drop or congestion in the target
+ * 		device. The particular positive error codes are not defined.
  *
  * u64 bpf_get_current_pid_tgid(void)
  * 	Description

 		struct TAG { MEMBERS } ATTRS NAME; \
 	}
+#ifdef __cplusplus
+/* sizeof(struct{}) is 1 in C++, not 0, can't use C version of the macro. */
+#define __DECLARE_FLEX_ARRAY(T, member)	\
+	T member[0]
+#else
 /**
  * __DECLARE_FLEX_ARRAY() - Declare a flexible array usable in a union
  *
 #ifndef __counted_by
 #define __counted_by(m)
 #endif
+#endif /* _UAPI_LINUX_STDDEF_H */

Keyboard shortcuts