tracing: in_irq() cleanup

Replace the obsolete and ambiguos macro in_irq() with new
macro in_hardirq().

Link: https://lkml.kernel.org/r/20210930000342.6016-1-changbin.du@gmail.com
Reviewed-by: Petr Mladek <pmladek@suse.com>
Signed-off-by: Changbin Du <changbin.du@gmail.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 6c3808132b1634d861c12bcab829b2396fb98c39..6b60ab9475edb3e04a5af854e557ee9c745f70c2 100644 (file)
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -890,7 +890,7 @@ static inline int ftrace_graph_addr(struct ftrace_graph_ent *trace)
                 * is set, and called by an interrupt handler, we still
                 * want to trace it.
                 */
-               if (in_irq())
+               if (in_hardirq())
                        trace_recursion_set(TRACE_IRQ_BIT);
                else
                        trace_recursion_clear(TRACE_IRQ_BIT);

diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index 6b5ff3ba4251f5f05e1a702284cd21c6a754ca7a..203204cadf92f3d0e67c3a03da521bfef8880100 100644 (file)
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -120,7 +120,7 @@ static inline int ftrace_graph_ignore_irqs(void)
        if (!ftrace_graph_skip_irqs || trace_recursion_test(TRACE_IRQ_BIT))
                return 0;
 
-       return in_irq();
+       return in_hardirq();
 }
 
 int trace_graph_entry(struct ftrace_graph_ent *trace)