Merge branch '4.0.8-rt6'

[zynq/linux.git] / kernel / trace / trace_output.c

diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 692bf7184c8c1322f54bc4fe529e4519ba22a35e..88a75cda3c416a5065eb09e3155fc7e6c9ea4979 100644 (file)
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -429,6 +429,7 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
 {
        char hardsoft_irq;
        char need_resched;
+       char need_resched_lazy;
        char irqs_off;
        int hardirq;
        int softirq;
@@ -456,6 +457,8 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
                need_resched = '.';
                break;
        }
+       need_resched_lazy =
+               (entry->flags & TRACE_FLAG_NEED_RESCHED_LAZY) ? 'L' : '.';
 
        hardsoft_irq =
                (hardirq && softirq) ? 'H' :
@@ -463,14 +466,25 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
                softirq ? 's' :
                '.';
 
-       trace_seq_printf(s, "%c%c%c",
-                        irqs_off, need_resched, hardsoft_irq);
+       trace_seq_printf(s, "%c%c%c%c",
+                        irqs_off, need_resched, need_resched_lazy,
+                        hardsoft_irq);
 
        if (entry->preempt_count)
                trace_seq_printf(s, "%x", entry->preempt_count);
        else
                trace_seq_putc(s, '.');
 
+       if (entry->preempt_lazy_count)
+               trace_seq_printf(s, "%x", entry->preempt_lazy_count);
+       else
+               trace_seq_putc(s, '.');
+
+       if (entry->migrate_disable)
+               trace_seq_printf(s, "%x", entry->migrate_disable);
+       else
+               trace_seq_putc(s, '.');
+
        return !trace_seq_has_overflowed(s);
 }