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

Changbin Du committed 5 years ago

Commit affc6591 parent 43c9dd82 files · +2 −2Browse files

Unified · Split

2 files

kernel/trace/trace.h +1 −1
kernel/trace/trace_functions_graph.c +1 −1

kernel/trace/trace.h+1−1

@@ -890,7 +890,7 @@ static inline int ftrace_graph_addr(struct ftrace_graph_ent *trace) · 889 unmodified lines
890	* is set, and called by an interrupt handler, we still	890	* is set, and called by an interrupt handler, we still
891	* want to trace it.	891	* want to trace it.
892	*/	892	*/
893	if (in_irq())	893	if (in_hardirq())
894	trace_recursion_set(TRACE_IRQ_BIT);	894	trace_recursion_set(TRACE_IRQ_BIT);
895	else	895	else
896	trace_recursion_clear(TRACE_IRQ_BIT);	896	trace_recursion_clear(TRACE_IRQ_BIT);

kernel/trace/trace_functions_graph.c+1−1

@@ -120,7 +120,7 @@ static inline int ftrace_graph_ignore_irqs(void) · 119 unmodified lines
120	if (!ftrace_graph_skip_irqs \|\| trace_recursion_test(TRACE_IRQ_BIT))	120	if (!ftrace_graph_skip_irqs \|\| trace_recursion_test(TRACE_IRQ_BIT))
121	return 0;	121	return 0;
122		122
123	return in_irq();	123	return in_hardirq();
124	}	124	}
125		125
126	int trace_graph_entry(struct ftrace_graph_ent *trace)	126	int trace_graph_entry(struct ftrace_graph_ent *trace)