diff options
author | Stephen Boyd <sboyd@kernel.org> | 2022-03-15 14:06:06 -0700 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2022-03-15 14:06:06 -0700 |
commit | 99105cc81885e1278c927cdff15a3fdef5c29289 (patch) | |
tree | c48ea12335dc9006df715a05433f3f19a3570ff7 /include/uapi/linux/perf_event.h | |
parent | ed06099c5d0b329082cc19c58eace0b20bf7fe70 (diff) | |
parent | 754e0b0e35608ed5206d6a67a791563c631cec07 (diff) |
Merge tag 'v5.17-rc4' into clk-ti
We want to get commit 31aa7056bbec ("ARM: dts: Don't use legacy clock
defines for dra7 clkctrl") so merge in the nearest rc.
Diffstat (limited to 'include/uapi/linux/perf_event.h')
-rw-r--r-- | include/uapi/linux/perf_event.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index 1b65042ab1db..82858b697c05 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h @@ -465,6 +465,8 @@ struct perf_event_attr { /* * User provided data if sigtrap=1, passed back to user via * siginfo_t::si_perf_data, e.g. to permit user to identify the event. + * Note, siginfo_t::si_perf_data is long-sized, and sig_data will be + * truncated accordingly on 32 bit architectures. */ __u64 sig_data; }; |