diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-23 11:23:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-23 11:23:37 -0800 |
| commit | 34597c85be987cc731a840fa0c9bb969c92bd986 (patch) | |
| tree | 0566bb640b9bf685245cfd94335facd15328da9b /include/trace | |
| parent | Merge tag 'ceph-for-5.5-rc8' of https://github.com/ceph/ceph-client (diff) | |
| parent | tracing/uprobe: Fix to make trace_uprobe_filter alignment safe (diff) | |
| download | linux-dev-34597c85be987cc731a840fa0c9bb969c92bd986.tar.xz linux-dev-34597c85be987cc731a840fa0c9bb969c92bd986.zip | |
Merge tag 'trace-v5.5-rc6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt:
"Various tracing fixes:
- Fix a function comparison warning for a xen trace event macro
- Fix a double perf_event linking to a trace_uprobe_filter for
multiple events
- Fix suspicious RCU warnings in trace event code for using
list_for_each_entry_rcu() when the "_rcu" portion wasn't needed.
- Fix a bug in the histogram code when using the same variable
- Fix a NULL pointer dereference when tracefs lockdown enabled and
calling trace_set_default_clock()
- A fix to a bug found with the double perf_event linking patch"
* tag 'trace-v5.5-rc6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing/uprobe: Fix to make trace_uprobe_filter alignment safe
tracing: Do not set trace clock if tracefs lockdown is in effect
tracing: Fix histogram code when expression has same var as value
tracing: trigger: Replace unneeded RCU-list traversals
tracing/uprobe: Fix double perf_event linking on multiprobe uprobe
tracing: xen: Ordered comparison of function pointers
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/xen.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/trace/events/xen.h b/include/trace/events/xen.h index 9a0e8af21310..a5ccfa67bc5c 100644 --- a/include/trace/events/xen.h +++ b/include/trace/events/xen.h @@ -66,7 +66,11 @@ TRACE_EVENT(xen_mc_callback, TP_PROTO(xen_mc_callback_fn_t fn, void *data), TP_ARGS(fn, data), TP_STRUCT__entry( - __field(xen_mc_callback_fn_t, fn) + /* + * Use field_struct to avoid is_signed_type() + * comparison of a function pointer. + */ + __field_struct(xen_mc_callback_fn_t, fn) __field(void *, data) ), TP_fast_assign( |