diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-06-15 23:58:27 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-06-15 23:58:27 -0400 |
| commit | 925344ccc91d7a7fd84cab2dece1c34bbd86fd8c (patch) | |
| tree | bd4110dc5a3b70a5674b9d6d5340cc1889f5d6e8 /include/uapi | |
| parent | a6821698918a579e7219d706092e83f367f01ba2 (diff) | |
| parent | 32c1431eea4881a6b17bd7c639315010aeefa452 (diff) | |
BackMerge tag 'v4.12-rc5' into drm-next
Linux 4.12-rc5 for nouveau fixes
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/keyctl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/keyctl.h b/include/uapi/linux/keyctl.h index 201c6644b237..ef16df06642a 100644 --- a/include/uapi/linux/keyctl.h +++ b/include/uapi/linux/keyctl.h | |||
| @@ -70,8 +70,8 @@ struct keyctl_dh_params { | |||
| 70 | }; | 70 | }; |
| 71 | 71 | ||
| 72 | struct keyctl_kdf_params { | 72 | struct keyctl_kdf_params { |
| 73 | char *hashname; | 73 | char __user *hashname; |
| 74 | char *otherinfo; | 74 | char __user *otherinfo; |
| 75 | __u32 otherinfolen; | 75 | __u32 otherinfolen; |
| 76 | __u32 __spare[8]; | 76 | __u32 __spare[8]; |
| 77 | }; | 77 | }; |