Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

[linux-2.6-microblaze.git] / include / trace / trace_events.h

diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h
index 7785961..8268bf7 100644 (file)
--- a/include/trace/trace_events.h
+++ b/include/trace/trace_events.h
@@ -231,9 +231,11 @@ TRACE_MAKE_SYSTEM_STR();
  * {
  *     struct trace_seq *s = &iter->seq;
  *     struct trace_event_raw_<call> *field; <-- defined in stage 1
- *     struct trace_entry *entry;
  *     struct trace_seq *p = &iter->tmp_seq;
- *     int ret;
+ *
+ * -------(for event)-------
+ *
+ *     struct trace_entry *entry;
  *
  *     entry = iter->ent;
  *
@@ -245,14 +247,23 @@ TRACE_MAKE_SYSTEM_STR();
  *     field = (typeof(field))entry;
  *
  *     trace_seq_init(p);
- *     ret = trace_seq_printf(s, "%s: ", <call>);
- *     if (ret)
- *             ret = trace_seq_printf(s, <TP_printk> "\n");
- *     if (!ret)
- *             return TRACE_TYPE_PARTIAL_LINE;
+ *     return trace_output_call(iter, <call>, <TP_printk> "\n");
  *
- *     return TRACE_TYPE_HANDLED;
- * }
+ * ------(or, for event class)------
+ *
+ *     int ret;
+ *
+ *     field = (typeof(field))iter->ent;
+ *
+ *     ret = trace_raw_output_prep(iter, trace_event);
+ *     if (ret != TRACE_TYPE_HANDLED)
+ *             return ret;
+ *
+ *     trace_event_printf(iter, <TP_printk> "\n");
+ *
+ *     return trace_handle_return(s);
+ * -------
+ *  }
  *
  * This is the method used to print the raw event to the trace
  * output format. Note, this is not needed if the data is read
@@ -364,7 +375,7 @@ trace_raw_output_##call(struct trace_iterator *iter, int flags,             \
        if (ret != TRACE_TYPE_HANDLED)                                  \
                return ret;                                             \
                                                                        \
-       trace_seq_printf(s, print);                                     \
+       trace_event_printf(iter, print);                                \
                                                                        \
        return trace_handle_return(s);                                  \
 }                                                                      \