diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-03-08 00:54:04 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-03-08 00:54:04 +0100 |
| commit | f2c1392ff3473a396e4d177ff5ad368b9d6cd211 (patch) | |
| tree | 2111e8c1e50e3fa56fc46bd4e80e5a577459e768 /include/trace/events/xen.h | |
| parent | b16d3d60b112c8cb90ebcd7ae97a5d2207d6f43c (diff) | |
| parent | e0f8b8a65a473a8baa439cf865a694bbeb83fe90 (diff) | |
Merge tag 'v4.14.170' into 4.14-2.3.x-imx
This is the 4.14.170 stable release
Conflicts:
drivers/net/phy/phy_device.c
drivers/tty/serial/imx.c
include/linux/platform_data/dma-imx-sdma.h
net/wireless/util.c
Diffstat (limited to 'include/trace/events/xen.h')
| -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 2ec9064a2bb7..e5150fc67e91 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( |