Skip to content

Commit bc849e9

Browse files
committed
rcu: Move rcu_needs_cpu() to tree.c
Now that RCU_FAST_NO_HZ is no more, there is but one implementation of the rcu_needs_cpu() function. This commit therefore moves this function from kernel/rcu/tree_plugin.c to kernel/rcu/tree.c. Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
1 parent e2c73a6 commit bc849e9

2 files changed

Lines changed: 18 additions & 16 deletions

File tree

kernel/rcu/tree.c

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,6 +1075,24 @@ void rcu_irq_enter_irqson(void)
10751075
local_irq_restore(flags);
10761076
}
10771077

1078+
/*
1079+
* Check to see if any future non-offloaded RCU-related work will need
1080+
* to be done by the current CPU, even if none need be done immediately,
1081+
* returning 1 if so. This function is part of the RCU implementation;
1082+
* it is -not- an exported member of the RCU API. This is used by
1083+
* the idle-entry code to figure out whether it is safe to disable the
1084+
* scheduler-clock interrupt.
1085+
*
1086+
* Just check whether or not this CPU has non-offloaded RCU callbacks
1087+
* queued.
1088+
*/
1089+
int rcu_needs_cpu(u64 basemono, u64 *nextevt)
1090+
{
1091+
*nextevt = KTIME_MAX;
1092+
return !rcu_segcblist_empty(&this_cpu_ptr(&rcu_data)->cblist) &&
1093+
!rcu_rdp_is_offloaded(this_cpu_ptr(&rcu_data));
1094+
}
1095+
10781096
/*
10791097
* If any sort of urgency was applied to the current CPU (for example,
10801098
* the scheduler-clock interrupt was enabled on a nohz_full CPU) in order

kernel/rcu/tree_plugin.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,22 +1251,6 @@ static void __init rcu_spawn_boost_kthreads(void)
12511251

12521252
#endif /* #else #ifdef CONFIG_RCU_BOOST */
12531253

1254-
/*
1255-
* Check to see if any future non-offloaded RCU-related work will need
1256-
* to be done by the current CPU, even if none need be done immediately,
1257-
* returning 1 if so. This function is part of the RCU implementation;
1258-
* it is -not- an exported member of the RCU API.
1259-
*
1260-
* Just check whether or not this CPU has non-offloaded RCU callbacks
1261-
* queued.
1262-
*/
1263-
int rcu_needs_cpu(u64 basemono, u64 *nextevt)
1264-
{
1265-
*nextevt = KTIME_MAX;
1266-
return !rcu_segcblist_empty(&this_cpu_ptr(&rcu_data)->cblist) &&
1267-
!rcu_rdp_is_offloaded(this_cpu_ptr(&rcu_data));
1268-
}
1269-
12701254
/*
12711255
* Is this CPU a NO_HZ_FULL CPU that should ignore RCU so that the
12721256
* grace-period kthread will do force_quiescent_state() processing?

0 commit comments

Comments
 (0)