Part of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes. Signed-off-by: Mathieu Desnoyers CC: Steven Rostedt CC: Frederic Weisbecker CC: Ingo Molnar CC: Thomas Gleixner CC: Xiao Guangrong CC: Tomohiro Kusumi CC: Kei Tokunaga CC: James Bottomley CC: Martin K. Petersen --- include/trace/events/scsi.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) Index: linux-2.6-lttng/include/trace/events/scsi.h =================================================================== --- linux-2.6-lttng.orig/include/trace/events/scsi.h +++ linux-2.6-lttng/include/trace/events/scsi.h @@ -238,7 +243,7 @@ TRACE_EVENT(scsi_dispatch_cmd_start, show_opcode_name(__entry->opcode), __parse_cdb(__get_dynamic_array(cmnd), __entry->cmd_len), __print_hex(__get_dynamic_array(cmnd), __entry->cmd_len)) -); +) TRACE_EVENT(scsi_dispatch_cmd_error, @@ -283,7 +288,7 @@ TRACE_EVENT(scsi_dispatch_cmd_error, __parse_cdb(__get_dynamic_array(cmnd), __entry->cmd_len), __print_hex(__get_dynamic_array(cmnd), __entry->cmd_len), __entry->rtn) -); +) DECLARE_EVENT_CLASS(scsi_cmd_done_timeout_template, @@ -332,15 +337,15 @@ DECLARE_EVENT_CLASS(scsi_cmd_done_timeou show_hostbyte_name(((__entry->result) >> 16) & 0xff), show_msgbyte_name(((__entry->result) >> 8) & 0xff), show_statusbyte_name(__entry->result & 0xff)) -); +) DEFINE_EVENT(scsi_cmd_done_timeout_template, scsi_dispatch_cmd_done, TP_PROTO(struct scsi_cmnd *cmd), - TP_ARGS(cmd)); + TP_ARGS(cmd)) DEFINE_EVENT(scsi_cmd_done_timeout_template, scsi_dispatch_cmd_timeout, TP_PROTO(struct scsi_cmnd *cmd), - TP_ARGS(cmd)); + TP_ARGS(cmd)) TRACE_EVENT(scsi_eh_wakeup, @@ -357,7 +362,7 @@ TRACE_EVENT(scsi_eh_wakeup, ), TP_printk("host_no=%u", __entry->host_no) -); +) #endif /* _TRACE_SCSI_H */ -- 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/