Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent
This commit is contained in:
commit
04a54d27ce
|
@ -166,6 +166,12 @@ FTRACE_ENTRY_DUP(wakeup, ctx_switch_entry,
|
||||||
|
|
||||||
#define FTRACE_STACK_ENTRIES 8
|
#define FTRACE_STACK_ENTRIES 8
|
||||||
|
|
||||||
|
#ifndef CONFIG_64BIT
|
||||||
|
# define IP_FMT "%08lx"
|
||||||
|
#else
|
||||||
|
# define IP_FMT "%016lx"
|
||||||
|
#endif
|
||||||
|
|
||||||
FTRACE_ENTRY(kernel_stack, stack_entry,
|
FTRACE_ENTRY(kernel_stack, stack_entry,
|
||||||
|
|
||||||
TRACE_STACK,
|
TRACE_STACK,
|
||||||
|
@ -175,8 +181,9 @@ FTRACE_ENTRY(kernel_stack, stack_entry,
|
||||||
__dynamic_array(unsigned long, caller )
|
__dynamic_array(unsigned long, caller )
|
||||||
),
|
),
|
||||||
|
|
||||||
F_printk("\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n"
|
F_printk("\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n"
|
||||||
"\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n",
|
"\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n"
|
||||||
|
"\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n",
|
||||||
__entry->caller[0], __entry->caller[1], __entry->caller[2],
|
__entry->caller[0], __entry->caller[1], __entry->caller[2],
|
||||||
__entry->caller[3], __entry->caller[4], __entry->caller[5],
|
__entry->caller[3], __entry->caller[4], __entry->caller[5],
|
||||||
__entry->caller[6], __entry->caller[7]),
|
__entry->caller[6], __entry->caller[7]),
|
||||||
|
@ -193,8 +200,9 @@ FTRACE_ENTRY(user_stack, userstack_entry,
|
||||||
__array( unsigned long, caller, FTRACE_STACK_ENTRIES )
|
__array( unsigned long, caller, FTRACE_STACK_ENTRIES )
|
||||||
),
|
),
|
||||||
|
|
||||||
F_printk("\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n"
|
F_printk("\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n"
|
||||||
"\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n",
|
"\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n"
|
||||||
|
"\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n",
|
||||||
__entry->caller[0], __entry->caller[1], __entry->caller[2],
|
__entry->caller[0], __entry->caller[1], __entry->caller[2],
|
||||||
__entry->caller[3], __entry->caller[4], __entry->caller[5],
|
__entry->caller[3], __entry->caller[4], __entry->caller[5],
|
||||||
__entry->caller[6], __entry->caller[7]),
|
__entry->caller[6], __entry->caller[7]),
|
||||||
|
|
|
@ -162,7 +162,7 @@ ftrace_define_fields_##name(struct ftrace_event_call *event_call) \
|
||||||
#define __dynamic_array(type, item)
|
#define __dynamic_array(type, item)
|
||||||
|
|
||||||
#undef F_printk
|
#undef F_printk
|
||||||
#define F_printk(fmt, args...) #fmt ", " __stringify(args)
|
#define F_printk(fmt, args...) __stringify(fmt) ", " __stringify(args)
|
||||||
|
|
||||||
#undef FTRACE_ENTRY_REG
|
#undef FTRACE_ENTRY_REG
|
||||||
#define FTRACE_ENTRY_REG(call, struct_name, etype, tstruct, print, filter,\
|
#define FTRACE_ENTRY_REG(call, struct_name, etype, tstruct, print, filter,\
|
||||||
|
|
Loading…
Reference in New Issue