Messages in this thread Patch in this message | | | From | Changbin Du <> | Subject | [PATCH] trace: in_irq() cleanup | Date | Thu, 30 Sep 2021 08:03:42 +0800 |
| |
Replace the obsolete and ambiguos macro in_irq() with new macro in_hardirq().
Signed-off-by: Changbin Du <changbin.du@gmail.com> Reviewed-by: Petr Mladek <pmladek@suse.com> --- kernel/trace/trace.h | 2 +- kernel/trace/trace_functions_graph.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index b7c0f8e160fb..aeec5aa0549d 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -881,7 +881,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 0de6837722da..b08d3923de98 100644 --- 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) -- 2.32.0
| |