diff options
-rw-r--r-- | kernel/rcu/tree.c | 2 | ||||
-rw-r--r-- | kernel/rcu/tree.h | 2 | ||||
-rw-r--r-- | kernel/rcu/tree_plugin.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 8251938fb4ae..fa76fd3c219c 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c | |||
@@ -661,7 +661,7 @@ static void rcu_eqs_exit_common(long long oldval, int user) | |||
661 | /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */ | 661 | /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */ |
662 | smp_mb__after_atomic(); /* See above. */ | 662 | smp_mb__after_atomic(); /* See above. */ |
663 | WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1)); | 663 | WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1)); |
664 | rcu_cleanup_after_idle(smp_processor_id()); | 664 | rcu_cleanup_after_idle(); |
665 | trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting); | 665 | trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting); |
666 | if (!user && !is_idle_task(current)) { | 666 | if (!user && !is_idle_task(current)) { |
667 | struct task_struct *idle __maybe_unused = | 667 | struct task_struct *idle __maybe_unused = |
diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h index 8bc3cacbe14a..36c30390e4e9 100644 --- a/kernel/rcu/tree.h +++ b/kernel/rcu/tree.h | |||
@@ -579,7 +579,7 @@ static int rcu_spawn_one_boost_kthread(struct rcu_state *rsp, | |||
579 | #endif /* #ifdef CONFIG_RCU_BOOST */ | 579 | #endif /* #ifdef CONFIG_RCU_BOOST */ |
580 | static void __init rcu_spawn_boost_kthreads(void); | 580 | static void __init rcu_spawn_boost_kthreads(void); |
581 | static void rcu_prepare_kthreads(int cpu); | 581 | static void rcu_prepare_kthreads(int cpu); |
582 | static void rcu_cleanup_after_idle(int cpu); | 582 | static void rcu_cleanup_after_idle(void); |
583 | static void rcu_prepare_for_idle(void); | 583 | static void rcu_prepare_for_idle(void); |
584 | static void rcu_idle_count_callbacks_posted(void); | 584 | static void rcu_idle_count_callbacks_posted(void); |
585 | static void print_cpu_stall_info_begin(void); | 585 | static void print_cpu_stall_info_begin(void); |
diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h index 5e68ab5fe317..2443282737ba 100644 --- a/kernel/rcu/tree_plugin.h +++ b/kernel/rcu/tree_plugin.h | |||
@@ -1523,7 +1523,7 @@ int rcu_needs_cpu(unsigned long *delta_jiffies) | |||
1523 | * Because we do not have RCU_FAST_NO_HZ, don't bother cleaning up | 1523 | * Because we do not have RCU_FAST_NO_HZ, don't bother cleaning up |
1524 | * after it. | 1524 | * after it. |
1525 | */ | 1525 | */ |
1526 | static void rcu_cleanup_after_idle(int cpu) | 1526 | static void rcu_cleanup_after_idle(void) |
1527 | { | 1527 | { |
1528 | } | 1528 | } |
1529 | 1529 | ||
@@ -1731,10 +1731,10 @@ static void rcu_prepare_for_idle(void) | |||
1731 | * any grace periods that elapsed while the CPU was idle, and if any | 1731 | * any grace periods that elapsed while the CPU was idle, and if any |
1732 | * callbacks are now ready to invoke, initiate invocation. | 1732 | * callbacks are now ready to invoke, initiate invocation. |
1733 | */ | 1733 | */ |
1734 | static void rcu_cleanup_after_idle(int cpu) | 1734 | static void rcu_cleanup_after_idle(void) |
1735 | { | 1735 | { |
1736 | #ifndef CONFIG_RCU_NOCB_CPU_ALL | 1736 | #ifndef CONFIG_RCU_NOCB_CPU_ALL |
1737 | if (rcu_is_nocb_cpu(cpu)) | 1737 | if (rcu_is_nocb_cpu(smp_processor_id())) |
1738 | return; | 1738 | return; |
1739 | if (rcu_try_advance_all_cbs()) | 1739 | if (rcu_try_advance_all_cbs()) |
1740 | invoke_rcu_core(); | 1740 | invoke_rcu_core(); |