History

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
  1. include/uapi/drm/msm_drm.h +3 −3
  2. include/uapi/linux/loop.h +0 −3
include/uapi/drm/msm_drm.h+3−3
@@ -171,7 +171,7 @@ struct drm_msm_gem_submit_cmd { · 170 unmodified lines
171171 __u32 size; /* in, cmdstream size */
172172 __u32 pad;
173173 __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 */
175175 };
176176
177177 /* Each buffer referenced elsewhere in the cmdstream submit (ie. the
@@ -215,8 +215,8 @@ struct drm_msm_gem_submit { · 37 unmodified lines
215215 __u32 fence; /* out */
216216 __u32 nr_bos; /* in, number of submit_bo's */
217217 __u32 nr_cmds; /* in, number of submit_cmd's */
218− __u64 __user bos; /* in, ptr to array of submit_bo's */
219− __u64 __user cmds; /* in, ptr to array of submit_cmd's */
218+ __u64 bos; /* in, ptr to array of submit_bo's */
219+ __u64 cmds; /* in, ptr to array of submit_cmd's */
220220 __s32 fence_fd; /* in/out fence fd (see MSM_SUBMIT_FENCE_FD_IN/OUT) */
221221 };
222222
include/uapi/linux/loop.h+0−3
@@ -22,7 +22,6 @@ enum { · 21 unmodified lines
2222 LO_FLAGS_AUTOCLEAR = 4,
2323 LO_FLAGS_PARTSCAN = 8,
2424 LO_FLAGS_DIRECT_IO = 16,
25− LO_FLAGS_BLOCKSIZE = 32,
2625 };
2726
2827 #include <asm/posix_types.h> /* for __kernel_old_dev_t */
@@ -60,8 +59,6 @@ struct loop_info64 { · 31 unmodified lines
6059 __u64 lo_init[2];
6160 };
6261
63−#define LO_INFO_BLOCKSIZE(l) (l)->lo_init[0]
64−
6562 /*
6663 * Loop filter types
6764 */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t