1 files changed, 7 insertions, 3 deletions

diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 282982195e09..0bb9cf2d53e6 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -389,7 +389,9 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
         char irqs_off;
         int hardirq;
         int softirq;
+        int nmi;
 
+        nmi = entry->flags & TRACE_FLAG_NMI;
         hardirq = entry->flags & TRACE_FLAG_HARDIRQ;
         softirq = entry->flags & TRACE_FLAG_SOFTIRQ;
 
@@ -415,10 +417,12 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
         }
 
         hardsoft_irq =
+                (nmi && hardirq)     ? 'Z' :
+                nmi                  ? 'z' :
                 (hardirq && softirq) ? 'H' :
-                hardirq ? 'h' :
-                softirq ? 's' :
-                '.';
+                hardirq              ? 'h' :
+                softirq              ? 's' :
+                                       '.' ;
 
         trace_seq_printf(s, "%c%c%c",
                          irqs_off, need_resched, hardsoft_irq);