Merge tag 'v4.13-rc7' into for-4.14/block-postmerge

Linux 4.13-rc7

Jens Axboe committed 9 years ago

Commit cd996fb2 parents e9a823f cc4a41f1034 files · +15391 −18233Browse files

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

Unified · Split

2 files

@@ -171,7 +171,7 @@ struct drm_msm_gem_submit_cmd { · 170 unmodified lines
171	__u32 size; /* in, cmdstream size */	171	__u32 size; /* in, cmdstream size */
172	__u32 pad;	172	__u32 pad;
173	__u32 nr_relocs; /* in, number of submit_reloc's */	173	__u32 nr_relocs; /* in, number of submit_reloc's */
174	__u64 __user relocs; /* in, ptr to array of submit_reloc's */	174	__u64 relocs; /* in, ptr to array of submit_reloc's */
175	};	175	};
176		176
177	/* Each buffer referenced elsewhere in the cmdstream submit (ie. the	177	/* Each buffer referenced elsewhere in the cmdstream submit (ie. the
@@ -215,8 +215,8 @@ struct drm_msm_gem_submit { · 37 unmodified lines
215	__u32 fence; /* out */	215	__u32 fence; /* out */
216	__u32 nr_bos; /* in, number of submit_bo's */	216	__u32 nr_bos; /* in, number of submit_bo's */
217	__u32 nr_cmds; /* in, number of submit_cmd's */	217	__u32 nr_cmds; /* in, number of submit_cmd's */
218	__u64 __user bos; /* in, ptr to array of submit_bo's */	218	__u64 bos; /* in, ptr to array of submit_bo's */
219	__u64 __user cmds; /* in, ptr to array of submit_cmd's */	219	__u64 cmds; /* in, ptr to array of submit_cmd's */
220	__s32 fence_fd; /* in/out fence fd (see MSM_SUBMIT_FENCE_FD_IN/OUT) */	220	__s32 fence_fd; /* in/out fence fd (see MSM_SUBMIT_FENCE_FD_IN/OUT) */
221	};	221	};
222		222

 	LO_FLAGS_AUTOCLEAR	= 4,
 	LO_FLAGS_PARTSCAN	= 8,
 	LO_FLAGS_DIRECT_IO	= 16,
-	LO_FLAGS_BLOCKSIZE	= 32,
 };
 #include <asm/posix_types.h>	/* for __kernel_old_dev_t */
 	__u64		   lo_init[2];
 };
-#define LO_INFO_BLOCKSIZE(l) (l)->lo_init[0]
 /*
  * Loop filter types
  */

Keyboard shortcuts