tracing: Still trace filtered irq functions when irq trace is disabled

[karo-tx-linux.git] / kernel / trace / trace_functions_graph.c

diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index e8d6bb55d719f75ea829f613d91191b82f70807f..a7d2a4c653d8d893f51652c8cd599bf780359f45 100644 (file)
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -227,7 +227,7 @@ int __trace_graph_entry(struct trace_array *tr,
 
 static inline int ftrace_graph_ignore_irqs(void)
 {
-       if (!ftrace_graph_skip_irqs)
+       if (!ftrace_graph_skip_irqs || trace_recursion_test(TRACE_IRQ_BIT))
                return 0;
 
        return in_irq();