diff options
| author | David S. Miller <davem@davemloft.net> | 2019-07-09 05:48:57 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-07-09 05:48:57 +0300 |
| commit | af144a983402f7fd324ce556d9f9011a8b3e01fe (patch) | |
| tree | 7a0250b960a36976bc683789d9fe86b9f60a97a5 /include/trace | |
| parent | 6413139dfc641aaaa30580b59696a5f7ea274194 (diff) | |
| parent | e858faf556d4e14c750ba1e8852783c6f9520a0e (diff) | |
| download | linux-af144a983402f7fd324ce556d9f9011a8b3e01fe.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two cases of overlapping changes, nothing fancy.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/rxrpc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/trace/events/rxrpc.h b/include/trace/events/rxrpc.h index d85816878a52..cc1d060cbf13 100644 --- a/include/trace/events/rxrpc.h +++ b/include/trace/events/rxrpc.h @@ -1379,7 +1379,7 @@ TRACE_EVENT(rxrpc_rx_eproto, ), TP_fast_assign( - __entry->call = call->debug_id; + __entry->call = call ? call->debug_id : 0; __entry->serial = serial; __entry->why = why; ), |