5 files changed, 52 insertions, 14 deletions

diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index df5b085c4150..ace2da9e0a0d 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -140,9 +140,17 @@ extern int filter_current_check_discard(struct ftrace_event_call *call,
                                         void *rec,
                                         struct ring_buffer_event *event);
 
+enum {
+        FILTER_OTHER = 0,
+        FILTER_STATIC_STRING,
+        FILTER_DYN_STRING,
+        FILTER_PTR_STRING,
+};
+
 extern int trace_define_field(struct ftrace_event_call *call,
                               const char *type, const char *name,
-                              int offset, int size, int is_signed);
+                              int offset, int size, int is_signed,
+                              int filter_type);
 extern int trace_define_common_fields(struct ftrace_event_call *call);
 
 #define is_signed_type(type)    (((type)(-1)) < 0)
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index 846a4ae501eb..63a3f7a80580 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -165,6 +165,15 @@ static inline void tracepoint_synchronize_unregister(void)
 
 #define PARAMS(args...) args
 
+#endif /* _LINUX_TRACEPOINT_H */
+
+/*
+ * Note: we keep the TRACE_EVENT outside the include file ifdef protection.
+ *  This is due to the way trace events work. If a file includes two
+ *  trace event headers under one "CREATE_TRACE_POINTS" the first include
+ *  will override the TRACE_EVENT and break the second include.
+ */
+
 #ifndef TRACE_EVENT
 /*
  * For use with the TRACE_EVENT macro:
@@ -276,6 +285,5 @@ static inline void tracepoint_synchronize_unregister(void)
 #define TRACE_EVENT_FN(name, proto, args, struct,               \
                 assign, print, reg, unreg)                      \
         DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
-#endif
 
-#endif
+#endif /* ifdef TRACE_EVENT (see note above) */
diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h
index 2a969850736d..a89ed590597a 100644
--- a/include/trace/define_trace.h
+++ b/include/trace/define_trace.h
@@ -61,6 +61,7 @@
 #include <trace/ftrace.h>
 #endif
 
+#undef TRACE_EVENT
 #undef TRACE_HEADER_MULTI_READ
 
 /* Only undef what we defined in this file */
diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
index 8949bb7eb082..a581ef211ff5 100644
--- a/include/trace/events/sched.h
+++ b/include/trace/events/sched.h
@@ -94,6 +94,7 @@ TRACE_EVENT(sched_wakeup,
                 __field(        pid_t,  pid                     )
                 __field(        int,    prio                    )
                 __field(        int,    success                 )
+                __field(        int,    cpu                     )
         ),
 
         TP_fast_assign(
@@ -101,11 +102,12 @@ TRACE_EVENT(sched_wakeup,
                 __entry->pid            = p->pid;
                 __entry->prio           = p->prio;
                 __entry->success        = success;
+                __entry->cpu            = task_cpu(p);
         ),
 
-        TP_printk("task %s:%d [%d] success=%d",
+        TP_printk("task %s:%d [%d] success=%d [%03d]",
                   __entry->comm, __entry->pid, __entry->prio,
-                  __entry->success)
+                  __entry->success, __entry->cpu)
 );
 
 /*
@@ -125,6 +127,7 @@ TRACE_EVENT(sched_wakeup_new,
                 __field(        pid_t,  pid                     )
                 __field(        int,    prio                    )
                 __field(        int,    success                 )
+                __field(        int,    cpu                     )
         ),
 
         TP_fast_assign(
@@ -132,11 +135,12 @@ TRACE_EVENT(sched_wakeup_new,
                 __entry->pid            = p->pid;
                 __entry->prio           = p->prio;
                 __entry->success        = success;
+                __entry->cpu            = task_cpu(p);
         ),
 
-        TP_printk("task %s:%d [%d] success=%d",
+        TP_printk("task %s:%d [%d] success=%d [%03d]",
                   __entry->comm, __entry->pid, __entry->prio,
-                  __entry->success)
+                  __entry->success, __entry->cpu)
 );
 
 /*
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index 3a0b44bdabf7..360a77ad79e1 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -21,6 +21,9 @@
 #undef __field
 #define __field(type, item)             type    item;
 
+#undef __field_ext
+#define __field_ext(type, item, filter_type)    type    item;
+
 #undef __array
 #define __array(type, item, len)        type    item[len];
 
@@ -71,7 +74,10 @@
  */
 
 #undef __field
-#define __field(type, item);
+#define __field(type, item)
+
+#undef __field_ext
+#define __field_ext(type, item, filter_type)
 
 #undef __array
 #define __array(type, item, len)
@@ -119,6 +125,9 @@
         if (!ret)                                                       \
                 return 0;
 
+#undef __field_ext
+#define __field_ext(type, item, filter_type)    __field(type, item)
+
 #undef __array
 #define __array(type, item, len)                                                \
         ret = trace_seq_printf(s, "\tfield:" #type " " #item "[" #len "];\t"    \
@@ -274,28 +283,33 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags)	\
         
 #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
 
-#undef __field
-#define __field(type, item)                                             \
+#undef __field_ext
+#define __field_ext(type, item, filter_type)                            \
         ret = trace_define_field(event_call, #type, #item,              \
                                  offsetof(typeof(field), item),         \
-                                 sizeof(field.item), is_signed_type(type));     \
+                                 sizeof(field.item),                    \
+                                 is_signed_type(type), filter_type);    \
         if (ret)                                                        \
                 return ret;
 
+#undef __field
+#define __field(type, item)     __field_ext(type, item, FILTER_OTHER)
+
 #undef __array
 #define __array(type, item, len)                                        \
         BUILD_BUG_ON(len > MAX_FILTER_STR_VAL);                         \
         ret = trace_define_field(event_call, #type "[" #len "]", #item, \
                                  offsetof(typeof(field), item),         \
-                                 sizeof(field.item), 0);                \
+                                 sizeof(field.item), 0, FILTER_OTHER);  \
         if (ret)                                                        \
                 return ret;
 
 #undef __dynamic_array
 #define __dynamic_array(type, item, len)                                       \
         ret = trace_define_field(event_call, "__data_loc " #type "[]", #item,  \
-                                offsetof(typeof(field), __data_loc_##item),    \
-                                 sizeof(field.__data_loc_##item), 0);
+                                 offsetof(typeof(field), __data_loc_##item),   \
+                                 sizeof(field.__data_loc_##item), 0,           \
+                                 FILTER_OTHER);
 
 #undef __string
 #define __string(item, src) __dynamic_array(char, item, -1)
@@ -329,6 +343,9 @@ ftrace_define_fields_##call(struct ftrace_event_call *event_call)	\
 #undef __field
 #define __field(type, item)
 
+#undef __field_ext
+#define __field_ext(type, item, filter_type)
+
 #undef __array
 #define __array(type, item, len)