Merge tag 'acpi-5.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-microblaze.git] / kernel / trace / trace_output.c

diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index a0bf446..c2ca40e 100644 (file)
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -492,8 +492,13 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
        trace_seq_printf(s, "%c%c%c",
                         irqs_off, need_resched, hardsoft_irq);
 
-       if (entry->preempt_count)
-               trace_seq_printf(s, "%x", entry->preempt_count);
+       if (entry->preempt_count & 0xf)
+               trace_seq_printf(s, "%x", entry->preempt_count & 0xf);
+       else
+               trace_seq_putc(s, '.');
+
+       if (entry->preempt_count & 0xf0)
+               trace_seq_printf(s, "%x", entry->preempt_count >> 4);
        else
                trace_seq_putc(s, '.');
 
@@ -656,7 +661,7 @@ int trace_print_lat_context(struct trace_iterator *iter)
                trace_seq_printf(
                        s, "%16s %7d %3d %d %08x %08lx ",
                        comm, entry->pid, iter->cpu, entry->flags,
-                       entry->preempt_count, iter->idx);
+                       entry->preempt_count & 0xf, iter->idx);
        } else {
                lat_print_generic(s, entry, iter->cpu);
        }