Commit c16de8fd authored by Li Zefan's avatar Li Zefan Committed by Steven Rostedt

tracing: fix F_printk() typos

I found some typos in F_printk(), so I wrote compile-time check
for it, and triggered some compile errors and warnings.

I've fixed them on x86_32, but I have no x86_64 in my hand, so there
may still be some compile warnings on 64bits.
Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
LKML-Reference: <4AADF60B.5070407@cn.fujitsu.com>

[ tested on x86_64, and works fine ]
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent a48f494e
...@@ -78,7 +78,7 @@ FTRACE_ENTRY(funcgraph_entry, ftrace_graph_ent_entry, ...@@ -78,7 +78,7 @@ FTRACE_ENTRY(funcgraph_entry, ftrace_graph_ent_entry,
__field_desc( int, graph_ent, depth ) __field_desc( int, graph_ent, depth )
), ),
F_printk("--> %lx (%d)", __entry->graph_ent.func, __entry->depth) F_printk("--> %lx (%d)", __entry->func, __entry->depth)
); );
/* Function return entry */ /* Function return entry */
...@@ -97,8 +97,8 @@ FTRACE_ENTRY(funcgraph_exit, ftrace_graph_ret_entry, ...@@ -97,8 +97,8 @@ FTRACE_ENTRY(funcgraph_exit, ftrace_graph_ret_entry,
F_printk("<-- %lx (%d) (start: %llx end: %llx) over: %d", F_printk("<-- %lx (%d) (start: %llx end: %llx) over: %d",
__entry->func, __entry->depth, __entry->func, __entry->depth,
__entry->calltime, __entry->rettim, __entry->calltime, __entry->rettime,
__entrty->depth) __entry->depth)
); );
/* /*
...@@ -133,7 +133,7 @@ FTRACE_ENTRY(context_switch, ctx_switch_entry, ...@@ -133,7 +133,7 @@ FTRACE_ENTRY(context_switch, ctx_switch_entry,
FTRACE_CTX_FIELDS FTRACE_CTX_FIELDS
), ),
F_printk(b"%u:%u:%u ==> %u:%u:%u [%03u]", F_printk("%u:%u:%u ==> %u:%u:%u [%03u]",
__entry->prev_pid, __entry->prev_prio, __entry->prev_state, __entry->prev_pid, __entry->prev_prio, __entry->prev_state,
__entry->next_pid, __entry->next_prio, __entry->next_state, __entry->next_pid, __entry->next_prio, __entry->next_state,
__entry->next_cpu __entry->next_cpu
...@@ -257,8 +257,8 @@ FTRACE_ENTRY(mmiotrace_rw, trace_mmiotrace_rw, ...@@ -257,8 +257,8 @@ FTRACE_ENTRY(mmiotrace_rw, trace_mmiotrace_rw,
__field_desc( unsigned char, rw, width ) __field_desc( unsigned char, rw, width )
), ),
F_printk("%lx %lx %lx %d %lx %lx", F_printk("%lx %lx %lx %d %x %x",
__entry->phs, __entry->value, __entry->pc, (unsigned long)__entry->phys, __entry->value, __entry->pc,
__entry->map_id, __entry->opcode, __entry->width) __entry->map_id, __entry->opcode, __entry->width)
); );
...@@ -275,8 +275,8 @@ FTRACE_ENTRY(mmiotrace_map, trace_mmiotrace_map, ...@@ -275,8 +275,8 @@ FTRACE_ENTRY(mmiotrace_map, trace_mmiotrace_map,
__field_desc( unsigned char, map, opcode ) __field_desc( unsigned char, map, opcode )
), ),
F_printk("%lx %lx %lx %d %lx", F_printk("%lx %lx %lx %d %x",
__entry->phs, __entry->virt, __entry->len, (unsigned long)__entry->phys, __entry->virt, __entry->len,
__entry->map_id, __entry->opcode) __entry->map_id, __entry->opcode)
); );
...@@ -370,7 +370,7 @@ FTRACE_ENTRY(kmem_alloc, kmemtrace_alloc_entry, ...@@ -370,7 +370,7 @@ FTRACE_ENTRY(kmem_alloc, kmemtrace_alloc_entry,
__field( int, node ) __field( int, node )
), ),
F_printk("type:%u call_site:%lx ptr:%p req:%lu alloc:%lu" F_printk("type:%u call_site:%lx ptr:%p req:%zi alloc:%zi"
" flags:%x node:%d", " flags:%x node:%d",
__entry->type_id, __entry->call_site, __entry->ptr, __entry->type_id, __entry->call_site, __entry->ptr,
__entry->bytes_req, __entry->bytes_alloc, __entry->bytes_req, __entry->bytes_alloc,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment