Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/kernel/trace/trace_entries.h b/kernel/trace/trace_entries.h
index eb7396b7e7c3073586b03d7cc68e6273cc5da994..c203ac4df791f28e074d387ce573cec74bc40cf6 100644 (file)
--- a/kernel/trace/trace_entries.h
+++ b/kernel/trace/trace_entries.h
@@ -328,11 +328,13 @@ FTRACE_ENTRY(branch, trace_branch,
                __array(        char,           func,   TRACE_FUNC_SIZE+1       )
                __array(        char,           file,   TRACE_FILE_SIZE+1       )
                __field(        char,           correct                         )
+               __field(        char,           constant                        )
        ),
 
-       F_printk("%u:%s:%s (%u)",
+       F_printk("%u:%s:%s (%u)%s",
                 __entry->line,
-                __entry->func, __entry->file, __entry->correct),
+                __entry->func, __entry->file, __entry->correct,
+                __entry->constant ? " CONSTANT" : ""),
 
        FILTER_OTHER
 );