Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...

diff --cc kernel/trace/trace_entries.h
index d91eb0541b3aa73f206e7f6ec8eee4c563c04233,205dcac8920686cf48f5f572b880c25cd2e93b1b..4108e1250ca2c2b83e58a99c851c6506fe1348bb
--- 1/kernel/trace/trace_entries.h
--- 2/kernel/trace/trace_entries.h
+++ b/kernel/trace/trace_entries.h
@@@ -175,13 -171,12 +181,14 @@@ FTRACE_ENTRY(kernel_stack, stack_entry
                __dynamic_array(unsigned long,  caller  )
        ),
  
-       F_printk("\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n"
-                "\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=> (" 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[3], __entry->caller[4], __entry->caller[5],
 -               __entry->caller[6], __entry->caller[7])
 +               __entry->caller[6], __entry->caller[7]),
 +
 +      FILTER_OTHER
  );
  
  FTRACE_ENTRY(user_stack, userstack_entry,
@@@ -193,13 -188,12 +200,14 @@@
                __array(        unsigned long,  caller, FTRACE_STACK_ENTRIES    )
        ),
  
-       F_printk("\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n"
-                "\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=> (" 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[3], __entry->caller[4], __entry->caller[5],
 -               __entry->caller[6], __entry->caller[7])
 +               __entry->caller[6], __entry->caller[7]),
 +
 +      FILTER_OTHER
  );
  
  /*

diff --cc kernel/trace/trace_export.c
index 7b46c9bd22aef8ed4f6de572965c439af54b5ff8,ad4000c71be093ee66d90dab6756777134c868c5..3dd15e8bc856d87f7e4525a1577b5af579db6f96
--- 1/kernel/trace/trace_export.c
--- 2/kernel/trace/trace_export.c
+++ b/kernel/trace/trace_export.c
@@@ -162,11 -150,10 +162,11 @@@ ftrace_define_fields_##name(struct ftra
  #define __dynamic_array(type, item)
  
  #undef F_printk
- #define F_printk(fmt, args...) #fmt ", "  __stringify(args)
+ #define F_printk(fmt, args...) __stringify(fmt) ", "  __stringify(args)
  
 -#undef FTRACE_ENTRY
 -#define FTRACE_ENTRY(call, struct_name, etype, tstruct, print)                \
 +#undef FTRACE_ENTRY_REG
 +#define FTRACE_ENTRY_REG(call, struct_name, etype, tstruct, print, filter,\
 +                       regfn)                                         \
                                                                        \
  struct ftrace_event_class event_class_ftrace_##call = {                       \
        .system                 = __stringify(TRACE_SYSTEM),            \