Merge tag 'v6.6-rc7' into sched/core, to pick up fixes

Pick up recent sched/urgent fixes merged upstream.

Ingo Molnar committed 3 years ago

Commit 4e5b65a2 parents 4c456c9 05d3ef8831 files · +8728 −3953Browse files

Showing the changes to include/uapi (2 of 831 files). Show all

Unified · Split

2 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 - query max pushes through getparam
		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;

 	unsigned short	sll_hatype;
 	unsigned char	sll_pkttype;
 	unsigned char	sll_halen;
-	union {
+	unsigned char	sll_addr[8];
-		unsigned char	sll_addr[8];
-		/* Actual length is in sll_halen. */
-		__DECLARE_FLEX_ARRAY(unsigned char, sll_addr_flex);
-	};
 };
 /* Packet types */

Keyboard shortcuts