diff options
| author | Maxime Ripard <[email protected]> | 2021-05-27 14:32:13 +0200 |
|---|---|---|
| committer | Maxime Ripard <[email protected]> | 2021-05-27 14:32:13 +0200 |
| commit | ffa52910faff64f2070af42c22d782c4572d889e (patch) | |
| tree | 18c103f25a1467d02af1ebf27d7f0a8b177f5825 /include/uapi/linux | |
| parent | 5ccbb2ee039f0bd81e2b34b670718186753a4e17 (diff) | |
| parent | 5522e9f7b0fbe2a0cb89c199b574523becc8c3ab (diff) | |
Merge drm/drm-next into drm-misc-next
i915 is broken without -rc3, let's bring that tag in to fix it.
Signed-off-by: Maxime Ripard <[email protected]>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/perf_event.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/signalfd.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index bf8143505c49..f92880a15645 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h @@ -464,7 +464,7 @@ struct perf_event_attr { /* * User provided data if sigtrap=1, passed back to user via - * siginfo_t::si_perf, e.g. to permit user to identify the event. + * siginfo_t::si_perf_data, e.g. to permit user to identify the event. */ __u64 sig_data; }; diff --git a/include/uapi/linux/signalfd.h b/include/uapi/linux/signalfd.h index 7e333042c7e3..83429a05b698 100644 --- a/include/uapi/linux/signalfd.h +++ b/include/uapi/linux/signalfd.h @@ -39,8 +39,6 @@ struct signalfd_siginfo { __s32 ssi_syscall; __u64 ssi_call_addr; __u32 ssi_arch; - __u32 __pad3; - __u64 ssi_perf; /* * Pad strcture to 128 bytes. Remember to update the @@ -51,7 +49,7 @@ struct signalfd_siginfo { * comes out of a read(2) and we really don't want to have * a compat on read(2). */ - __u8 __pad[16]; + __u8 __pad[28]; }; |