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/infiniband/hw | |
| parent | Linux 5.5-rc3 (diff) | |
| parent | Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts (diff) | |
| download | linux-dev-46f5cfc13d54962097cb0cc5f97593e2a98a6aed.tar.xz linux-dev-46f5cfc13d54962097cb0cc5f97593e2a98a6aed.zip | |
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/infiniband/hw')
| -rw-r--r-- | drivers/infiniband/hw/hfi1/trace_tid.h | 8 | ||||
| -rw-r--r-- | drivers/infiniband/hw/hfi1/trace_tx.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/infiniband/hw/hfi1/trace_tid.h b/drivers/infiniband/hw/hfi1/trace_tid.h index 343fb9894a82..985ffa9cc958 100644 --- a/drivers/infiniband/hw/hfi1/trace_tid.h +++ b/drivers/infiniband/hw/hfi1/trace_tid.h @@ -138,10 +138,10 @@ TRACE_EVENT(/* put_tid */ TP_ARGS(dd, index, type, pa, order), TP_STRUCT__entry(/* entry */ DD_DEV_ENTRY(dd) - __field(unsigned long, pa); - __field(u32, index); - __field(u32, type); - __field(u16, order); + __field(unsigned long, pa) + __field(u32, index) + __field(u32, type) + __field(u16, order) ), TP_fast_assign(/* assign */ DD_DEV_ASSIGN(dd); diff --git a/drivers/infiniband/hw/hfi1/trace_tx.h b/drivers/infiniband/hw/hfi1/trace_tx.h index 09eb0c9ada00..769e5e4710c6 100644 --- a/drivers/infiniband/hw/hfi1/trace_tx.h +++ b/drivers/infiniband/hw/hfi1/trace_tx.h @@ -588,7 +588,7 @@ TRACE_EVENT(hfi1_sdma_user_reqinfo, TP_PROTO(struct hfi1_devdata *dd, u16 ctxt, u8 subctxt, u16 *i), TP_ARGS(dd, ctxt, subctxt, i), TP_STRUCT__entry( - DD_DEV_ENTRY(dd); + DD_DEV_ENTRY(dd) __field(u16, ctxt) __field(u8, subctxt) __field(u8, ver_opcode) |