From: Steven Rostedt Frederic Weisbecker stated that it is confusing to see a unmatched '<', when the '>' is hidden inside a macro. This patch moves it out back to the string. Reported-by: Frederic Weisbecker Signed-off-by: Steven Rostedt --- include/trace/events/irq.h | 8 +++++--- include/trace/events/kmem.h | 12 +++++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h index c6c0ff1..4294a6d 100644 --- a/include/trace/events/irq.h +++ b/include/trace/events/irq.h @@ -9,7 +9,7 @@ #define softirq_name(sirq) sirq##_SOFTIRQ, #sirq #define show_softirq_name_format(val) \ - "%d=%s,%d=%s,%d=%s,%d=%s,%d=%s,%d=%s,%d=%s,%d=%s,%d=%s>" + "%d=%s,%d=%s,%d=%s,%d=%s,%d=%s,%d=%s,%d=%s,%d=%s,%d=%s" #define show_softirq_name_args() \ softirq_name(HI), \ softirq_name(TIMER), \ @@ -106,7 +106,8 @@ TRACE_EVENT(softirq_entry, __entry->vec = (int)(h - vec); ), - TP_FORMAT("softirq= action= action=", show_softirq_name_args()) ); @@ -135,7 +136,8 @@ TRACE_EVENT(softirq_exit, __entry->vec = (int)(h - vec); ), - TP_FORMAT("softirq= action= action=", show_softirq_name_args()) ); diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h index 5c8f942..32c93da 100644 --- a/include/trace/events/kmem.h +++ b/include/trace/events/kmem.h @@ -22,7 +22,7 @@ "0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s," \ "0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s," \ "0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s," \ - "0x%lx=%s,0x%lx=%s>" + "0x%lx=%s,0x%lx=%s" #define show_gfp_flags_args() \ (unsigned long)GFP_HIGHUSER_MOVABLE, "GFP_HIGHUSER_MOVABLE", \ (unsigned long)GFP_HIGHUSER, "GFP_HIGHUSER", \ @@ -76,7 +76,7 @@ TRACE_EVENT(kmalloc, TP_FORMAT("call_site= ptr= bytes_req= " "bytes_alloc= gfp_flags=", show_gfp_flags_args()) ); TRACE_EVENT(kmem_cache_alloc, @@ -107,7 +107,7 @@ TRACE_EVENT(kmem_cache_alloc, TP_FORMAT("call_site= ptr= bytes_req= " "bytes_alloc= gfp_flags=", show_gfp_flags_args()) ); TRACE_EVENT(kmalloc_node, @@ -141,7 +141,8 @@ TRACE_EVENT(kmalloc_node, TP_FORMAT("call_site= ptr= bytes_req= " "bytes_alloc= gfp_flags=", show_gfp_flags_args()) + show_gfp_flags_format() "> node=", + show_gfp_flags_args()) ); TRACE_EVENT(kmem_cache_alloc_node, @@ -175,7 +176,8 @@ TRACE_EVENT(kmem_cache_alloc_node, TP_FORMAT("call_site= ptr= bytes_req= " "bytes_alloc= gfp_flags=", show_gfp_flags_args()) + show_gfp_flags_format() "> node=", + show_gfp_flags_args()) ); TRACE_EVENT(kfree, -- 1.6.3.1 -- -- 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/