diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-12-25 10:43:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-12-25 10:43:08 +0100 |
| commit | 46f5cfc13d54962097cb0cc5f97593e2a98a6aed (patch) | |
| tree | 1ec5da58e3d085a7e358a4b7adf3b6e6b7ce1753 /drivers/net/fjes | |
| parent | 46cf053efec6a3a5f343fead837777efe8252a46 (diff) | |
| parent | 2040cf9f59037aa8aec749363e69ead165b67b43 (diff) | |
Merge branch 'core/kprobes' into perf/core, to pick up a completed branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/fjes')
| -rw-r--r-- | drivers/net/fjes/fjes_trace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/fjes/fjes_trace.h b/drivers/net/fjes/fjes_trace.h index c611b6a80b20..9237b69d8e21 100644 --- a/drivers/net/fjes/fjes_trace.h +++ b/drivers/net/fjes/fjes_trace.h @@ -28,7 +28,7 @@ TRACE_EVENT(fjes_hw_issue_request_command, __field(u8, cs_busy) __field(u8, cs_complete) __field(int, timeout) - __field(int, ret); + __field(int, ret) ), TP_fast_assign( __entry->cr_req = cr->bits.req_code; |