diff options
author | Arjan van de Ven <arjan@infradead.org> | 2006-03-21 01:33:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-03-21 01:33:17 -0500 |
commit | 4a3e2f711a00a1feb72ae12fdc749da10179d185 (patch) | |
tree | 76ced9d3270dea4b864da71fa1d4415d2e3c8b11 /net/core/flow.c | |
parent | d4ccd08cdfa8d34f4d25b62041343c52fc79385f (diff) |
[NET] sem2mutex: net/
Semaphore to mutex conversion.
The conversion was generated via scripts, and the result was validated
automatically via a script as well.
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/flow.c')
-rw-r--r-- | net/core/flow.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/core/flow.c b/net/core/flow.c index c4f25385029f..55789f832eda 100644 --- a/net/core/flow.c +++ b/net/core/flow.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/notifier.h> | 20 | #include <linux/notifier.h> |
21 | #include <linux/cpu.h> | 21 | #include <linux/cpu.h> |
22 | #include <linux/cpumask.h> | 22 | #include <linux/cpumask.h> |
23 | #include <linux/mutex.h> | ||
23 | #include <net/flow.h> | 24 | #include <net/flow.h> |
24 | #include <asm/atomic.h> | 25 | #include <asm/atomic.h> |
25 | #include <asm/semaphore.h> | 26 | #include <asm/semaphore.h> |
@@ -287,11 +288,11 @@ static void flow_cache_flush_per_cpu(void *data) | |||
287 | void flow_cache_flush(void) | 288 | void flow_cache_flush(void) |
288 | { | 289 | { |
289 | struct flow_flush_info info; | 290 | struct flow_flush_info info; |
290 | static DECLARE_MUTEX(flow_flush_sem); | 291 | static DEFINE_MUTEX(flow_flush_sem); |
291 | 292 | ||
292 | /* Don't want cpus going down or up during this. */ | 293 | /* Don't want cpus going down or up during this. */ |
293 | lock_cpu_hotplug(); | 294 | lock_cpu_hotplug(); |
294 | down(&flow_flush_sem); | 295 | mutex_lock(&flow_flush_sem); |
295 | atomic_set(&info.cpuleft, num_online_cpus()); | 296 | atomic_set(&info.cpuleft, num_online_cpus()); |
296 | init_completion(&info.completion); | 297 | init_completion(&info.completion); |
297 | 298 | ||
@@ -301,7 +302,7 @@ void flow_cache_flush(void) | |||
301 | local_bh_enable(); | 302 | local_bh_enable(); |
302 | 303 | ||
303 | wait_for_completion(&info.completion); | 304 | wait_for_completion(&info.completion); |
304 | up(&flow_flush_sem); | 305 | mutex_unlock(&flow_flush_sem); |
305 | unlock_cpu_hotplug(); | 306 | unlock_cpu_hotplug(); |
306 | } | 307 | } |
307 | 308 | ||