From: Ingo Molnar <mingo@kernel.org>
Date: Sat, 24 Mar 2012 07:19:09 +0000 (+0100)
Subject: Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste... 
X-Git-Tag: accepted/tizen/common/20141203.182822~4854^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=04a54d27ce9698d108d29c8a6a50c28f7446336b;p=platform%2Fkernel%2Flinux-arm64.git

Merge branch 'tip/perf/urgent' of git://git./linux/kernel/git/rostedt/linux-trace into perf/urgent
---

04a54d27ce9698d108d29c8a6a50c28f7446336b
diff --cc kernel/trace/trace_entries.h
index d91eb05,205dcac..4108e12
--- a/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 7b46c9b,ad4000c..3dd15e8
--- a/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),		\