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/dev.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/dev.c')
-rw-r--r-- | net/core/dev.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index ee044097f7f2..08dec6eb922b 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -81,6 +81,7 @@ | |||
81 | #include <linux/types.h> | 81 | #include <linux/types.h> |
82 | #include <linux/kernel.h> | 82 | #include <linux/kernel.h> |
83 | #include <linux/sched.h> | 83 | #include <linux/sched.h> |
84 | #include <linux/mutex.h> | ||
84 | #include <linux/string.h> | 85 | #include <linux/string.h> |
85 | #include <linux/mm.h> | 86 | #include <linux/mm.h> |
86 | #include <linux/socket.h> | 87 | #include <linux/socket.h> |
@@ -2931,7 +2932,7 @@ static void netdev_wait_allrefs(struct net_device *dev) | |||
2931 | * 2) Since we run with the RTNL semaphore not held, we can sleep | 2932 | * 2) Since we run with the RTNL semaphore not held, we can sleep |
2932 | * safely in order to wait for the netdev refcnt to drop to zero. | 2933 | * safely in order to wait for the netdev refcnt to drop to zero. |
2933 | */ | 2934 | */ |
2934 | static DECLARE_MUTEX(net_todo_run_mutex); | 2935 | static DEFINE_MUTEX(net_todo_run_mutex); |
2935 | void netdev_run_todo(void) | 2936 | void netdev_run_todo(void) |
2936 | { | 2937 | { |
2937 | struct list_head list = LIST_HEAD_INIT(list); | 2938 | struct list_head list = LIST_HEAD_INIT(list); |
@@ -2939,7 +2940,7 @@ void netdev_run_todo(void) | |||
2939 | 2940 | ||
2940 | 2941 | ||
2941 | /* Need to guard against multiple cpu's getting out of order. */ | 2942 | /* Need to guard against multiple cpu's getting out of order. */ |
2942 | down(&net_todo_run_mutex); | 2943 | mutex_lock(&net_todo_run_mutex); |
2943 | 2944 | ||
2944 | /* Not safe to do outside the semaphore. We must not return | 2945 | /* Not safe to do outside the semaphore. We must not return |
2945 | * until all unregister events invoked by the local processor | 2946 | * until all unregister events invoked by the local processor |
@@ -2996,7 +2997,7 @@ void netdev_run_todo(void) | |||
2996 | } | 2997 | } |
2997 | 2998 | ||
2998 | out: | 2999 | out: |
2999 | up(&net_todo_run_mutex); | 3000 | mutex_unlock(&net_todo_run_mutex); |
3000 | } | 3001 | } |
3001 | 3002 | ||
3002 | /** | 3003 | /** |