Add channel id field to marker structure. Identifies the buffer group in which the event will be written. Signed-off-by: Mathieu Desnoyers --- include/linux/marker.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) Index: linux-2.6-lttng/include/linux/marker.h =================================================================== --- linux-2.6-lttng.orig/include/linux/marker.h 2009-02-06 15:46:14.000000000 -0500 +++ linux-2.6-lttng/include/linux/marker.h 2009-02-06 15:46:28.000000000 -0500 @@ -22,6 +22,7 @@ struct marker; /** * marker_probe_func - Type of a marker probe function + * @mdata: marker data * @probe_private: probe private data * @call_private: call site private data * @fmt: format string @@ -32,7 +33,8 @@ struct marker; * Type of marker probe functions. They receive the mdata and need to parse the * format string to recover the variable argument list. */ -typedef void marker_probe_func(void *probe_private, void *call_private, +typedef void marker_probe_func(const struct marker *mdata, + void *probe_private, void *call_private, const char *fmt, va_list *args); struct marker_probe_closure { @@ -49,7 +51,7 @@ struct marker { DEFINE_IMV(char, state);/* Immediate value state. */ char ptype; /* probe type : 0 : single, 1 : multi */ /* Probe wrapper */ - u16 chan_id; /* Numeric channel identifier, dynamic */ + u16 channel_id; /* Numeric channel identifier, dynamic */ u16 event_id; /* Numeric event identifier, dynamic */ void (*call)(const struct marker *mdata, void *call_private, ...); struct marker_probe_closure single; -- Mathieu Desnoyers OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/