Skip to content

Commit 04b25a4

Browse files
committed
rcu: Mark rcu_nmi_enter() call to rcu_cleanup_after_idle() noinstr
The objtool complains about the call to rcu_cleanup_after_idle() from rcu_nmi_enter(), so this commit adds instrumentation_begin() before that call and instrumentation_end() after it. Acked-by: Peter Zijlstra (Intel) <[email protected]> Signed-off-by: Paul E. McKenney <[email protected]>
1 parent 55fbe86 commit 04b25a4

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

kernel/rcu/tree.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -990,8 +990,11 @@ noinstr void rcu_nmi_enter(void)
990990
rcu_dynticks_eqs_exit();
991991
// ... but is watching here.
992992

993-
if (!in_nmi())
993+
if (!in_nmi()) {
994+
instrumentation_begin();
994995
rcu_cleanup_after_idle();
996+
instrumentation_end();
997+
}
995998

996999
instrumentation_begin();
9971000
// instrumentation for the noinstr rcu_dynticks_curr_cpu_in_eqs()

0 commit comments

Comments
 (0)