diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-29 16:03:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-29 16:03:48 +0200 |
| commit | 2d074918fb1568f398777343ff9a28049fb86337 (patch) | |
| tree | 84277c1471f6d575a9515d42a53345666addabc8 /include/trace/events/mmc.h | |
| parent | 78282bec4b4a02a13b87d01fbe529396d37db926 (diff) | |
| parent | f67b15037a7a50c57f72e69a6d59941ad90a0f0f (diff) | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
kernel/events/hw_breakpoint.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/trace/events/mmc.h')
| -rw-r--r-- | include/trace/events/mmc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/trace/events/mmc.h b/include/trace/events/mmc.h index 200f731be557..7b706ff21335 100644 --- a/include/trace/events/mmc.h +++ b/include/trace/events/mmc.h @@ -86,8 +86,8 @@ TRACE_EVENT(mmc_request_start, __entry->stop_flags, __entry->stop_retries, __entry->sbc_opcode, __entry->sbc_arg, __entry->sbc_flags, __entry->sbc_retries, - __entry->blocks, __entry->blk_addr, - __entry->blksz, __entry->data_flags, __entry->tag, + __entry->blocks, __entry->blksz, + __entry->blk_addr, __entry->data_flags, __entry->tag, __entry->can_retune, __entry->doing_retune, __entry->retune_now, __entry->need_retune, __entry->hold_retune, __entry->retune_period) |