History

[PATCH] convert kernel/rcupdate.c:rcu_barrier_sema to mutex

Convert kernel/rcupdate's rcu_barrier_sema to mutex.

Ingo Molnar committed 20 years ago

Commit 9331b311 parent 3d3f26a1 file · +5 −5Browse files

Unified · Split

kernel/rcupdate.c+5−5
@@ -47,6 +47,7 @@ · 46 unmodified lines
47#include <linux/notifier.h>47#include <linux/notifier.h>
48#include <linux/rcupdate.h>48#include <linux/rcupdate.h>
49#include <linux/cpu.h>49#include <linux/cpu.h>
50#include <linux/mutex.h>
50 51
51/* Definition for rcupdate control block. */52/* Definition for rcupdate control block. */
52struct rcu_ctrlblk rcu_ctrlblk = {53struct rcu_ctrlblk rcu_ctrlblk = {
@@ -75,7 +76,7 @@ static int rsinterval = 1000; · 22 unmodified lines
75#endif76#endif
76 77
77static atomic_t rcu_barrier_cpu_count;78static atomic_t rcu_barrier_cpu_count;
78static struct semaphore rcu_barrier_sema;79static DEFINE_MUTEX(rcu_barrier_mutex);
79static struct completion rcu_barrier_completion;80static struct completion rcu_barrier_completion;
80 81
81#ifdef CONFIG_SMP82#ifdef CONFIG_SMP
@@ -207,13 +208,13 @@ static void rcu_barrier_func(void *notused) · 125 unmodified lines
207void rcu_barrier(void)208void rcu_barrier(void)
208{209{
209 BUG_ON(in_interrupt());210 BUG_ON(in_interrupt());
210 /* Take cpucontrol semaphore to protect against CPU hotplug */211 /* Take cpucontrol mutex to protect against CPU hotplug */
211 down(&rcu_barrier_sema);212 mutex_lock(&rcu_barrier_mutex);
212 init_completion(&rcu_barrier_completion);213 init_completion(&rcu_barrier_completion);
213 atomic_set(&rcu_barrier_cpu_count, 0);214 atomic_set(&rcu_barrier_cpu_count, 0);
214 on_each_cpu(rcu_barrier_func, NULL, 0, 1);215 on_each_cpu(rcu_barrier_func, NULL, 0, 1);
215 wait_for_completion(&rcu_barrier_completion);216 wait_for_completion(&rcu_barrier_completion);
216 up(&rcu_barrier_sema);217 mutex_unlock(&rcu_barrier_mutex);
217}218}
218EXPORT_SYMBOL_GPL(rcu_barrier);219EXPORT_SYMBOL_GPL(rcu_barrier);
219 220
@@ -549,7 +550,6 @@ static struct notifier_block __devinitdata rcu_nb = { · 329 unmodified lines
549 */550 */
550void __init rcu_init(void)551void __init rcu_init(void)
551{552{
552 sema_init(&rcu_barrier_sema, 1);
553 rcu_cpu_notify(&rcu_nb, CPU_UP_PREPARE,553 rcu_cpu_notify(&rcu_nb, CPU_UP_PREPARE,
554 (void *)(long)smp_processor_id());554 (void *)(long)smp_processor_id());
555 /* Register notifier for non-boot CPUs */555 /* Register notifier for non-boot CPUs */