diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2017-01-10 02:23:15 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-26 02:24:37 -0500 |
| commit | bdeaa468e22171497b289c2f31d20ab6b318d53c (patch) | |
| tree | 443853a9dd570f9d90afe1ba1f39add7b6ac2ffd /kernel/rcu | |
| parent | f779e00d2e86df2c9409c7cc8c054113c5086d1b (diff) | |
rcu: Remove cond_resched() from Tiny synchronize_sched()
commit f466ae66fa6a599f9a53b5f9bafea4b8cfffa7fb upstream.
It is now legal to invoke synchronize_sched() at early boot, which causes
Tiny RCU's synchronize_sched() to emit spurious splats. This commit
therefore removes the cond_resched() from Tiny RCU's synchronize_sched().
Fixes: 8b355e3bc140 ("rcu: Drive expedited grace periods from workqueue")
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/rcu')
| -rw-r--r-- | kernel/rcu/tiny.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c index 1898559e6b60..b23a4d076f3d 100644 --- a/kernel/rcu/tiny.c +++ b/kernel/rcu/tiny.c | |||
| @@ -185,9 +185,6 @@ static __latent_entropy void rcu_process_callbacks(struct softirq_action *unused | |||
| 185 | * benefits of doing might_sleep() to reduce latency.) | 185 | * benefits of doing might_sleep() to reduce latency.) |
| 186 | * | 186 | * |
| 187 | * Cool, huh? (Due to Josh Triplett.) | 187 | * Cool, huh? (Due to Josh Triplett.) |
| 188 | * | ||
| 189 | * But we want to make this a static inline later. The cond_resched() | ||
| 190 | * currently makes this problematic. | ||
| 191 | */ | 188 | */ |
| 192 | void synchronize_sched(void) | 189 | void synchronize_sched(void) |
| 193 | { | 190 | { |
| @@ -195,7 +192,6 @@ void synchronize_sched(void) | |||
| 195 | lock_is_held(&rcu_lock_map) || | 192 | lock_is_held(&rcu_lock_map) || |
| 196 | lock_is_held(&rcu_sched_lock_map), | 193 | lock_is_held(&rcu_sched_lock_map), |
| 197 | "Illegal synchronize_sched() in RCU read-side critical section"); | 194 | "Illegal synchronize_sched() in RCU read-side critical section"); |
| 198 | cond_resched(); | ||
| 199 | } | 195 | } |
| 200 | EXPORT_SYMBOL_GPL(synchronize_sched); | 196 | EXPORT_SYMBOL_GPL(synchronize_sched); |
| 201 | 197 | ||
