diff options
Diffstat (limited to 'kernel/rcupdate.c')
-rw-r--r-- | kernel/rcupdate.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c index fedf5e369755..af8a2a57e17d 100644 --- a/kernel/rcupdate.c +++ b/kernel/rcupdate.c | |||
@@ -47,6 +47,7 @@ | |||
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. */ |
52 | struct rcu_ctrlblk rcu_ctrlblk = { | 53 | struct rcu_ctrlblk rcu_ctrlblk = { |
@@ -75,7 +76,7 @@ static int rsinterval = 1000; | |||
75 | #endif | 76 | #endif |
76 | 77 | ||
77 | static atomic_t rcu_barrier_cpu_count; | 78 | static atomic_t rcu_barrier_cpu_count; |
78 | static struct semaphore rcu_barrier_sema; | 79 | static DEFINE_MUTEX(rcu_barrier_mutex); |
79 | static struct completion rcu_barrier_completion; | 80 | static struct completion rcu_barrier_completion; |
80 | 81 | ||
81 | #ifdef CONFIG_SMP | 82 | #ifdef CONFIG_SMP |
@@ -207,13 +208,13 @@ static void rcu_barrier_func(void *notused) | |||
207 | void rcu_barrier(void) | 208 | void 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 | } |
218 | EXPORT_SYMBOL_GPL(rcu_barrier); | 219 | EXPORT_SYMBOL_GPL(rcu_barrier); |
219 | 220 | ||
@@ -549,7 +550,6 @@ static struct notifier_block __devinitdata rcu_nb = { | |||
549 | */ | 550 | */ |
550 | void __init rcu_init(void) | 551 | void __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 */ |