Merge branch 'topic/hda' into for-linus

[karo-tx-linux.git] / kernel / trace / trace_events_stage_1.h

diff --git a/kernel/trace/trace_events_stage_1.h b/kernel/trace/trace_events_stage_1.h
index 15e9bf965a189ea8f685f17bb84665f35b51a389..38985f9b379c4b4037d24095c3dafb19b3213117 100644 (file)
--- a/kernel/trace/trace_events_stage_1.h
+++ b/kernel/trace/trace_events_stage_1.h
@@ -6,11 +6,13 @@
  * struct ftrace_raw_<call> {
  *     struct trace_entry              ent;
  *     <type>                          <item>;
+ *     <type2>                         <item2>[<len>];
  *     [...]
  * };
  *
- * The <type> <item> is created by the TRACE_FIELD(type, item, assign)
- * macro. We simply do "type item;", and that will create the fields
+ * The <type> <item> is created by the __field(type, item) macro or
+ * the __array(type2, item2, len) macro.
+ * We simply do "type item;", and that will create the fields
  * in the structure.
  */
 
@@ -27,7 +29,7 @@
 #define TP_STRUCT__entry(args...) args
 
 #undef TRACE_EVENT
-#define TRACE_EVENT(name, proto, args, tstruct, print, assign) \
+#define TRACE_EVENT(name, proto, args, tstruct, assign, print) \
        struct ftrace_raw_##name {                              \
                struct trace_entry      ent;                    \
                tstruct                                         \