X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fatm%2Fioctl.c;h=eb109af7eb4a45b2cffef7aec1b2b146b6ea733b;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=851cfa6312af3288b9cdf14d1faa91028b583b88;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/net/atm/ioctl.c b/net/atm/ioctl.c
index 851cfa631..eb109af7e 100644
--- a/net/atm/ioctl.c
+++ b/net/atm/ioctl.c
@@ -18,7 +18,6 @@
 #include <linux/atmmpc.h>
 #include <net/atmclip.h>
 #include <linux/atmlec.h>
-#include <linux/mutex.h>
 #include <asm/ioctls.h>
 
 #include "resources.h"
@@ -26,22 +25,22 @@
 #include "common.h"
 
 
-static DEFINE_MUTEX(ioctl_mutex);
+static DECLARE_MUTEX(ioctl_mutex);
 static LIST_HEAD(ioctl_list);
 
 
 void register_atm_ioctl(struct atm_ioctl *ioctl)
 {
-	mutex_lock(&ioctl_mutex);
+	down(&ioctl_mutex);
 	list_add_tail(&ioctl->list, &ioctl_list);
-	mutex_unlock(&ioctl_mutex);
+	up(&ioctl_mutex);
 }
 
 void deregister_atm_ioctl(struct atm_ioctl *ioctl)
 {
-	mutex_lock(&ioctl_mutex);
+	down(&ioctl_mutex);
 	list_del(&ioctl->list);
-	mutex_unlock(&ioctl_mutex);
+	up(&ioctl_mutex);
 }
 
 EXPORT_SYMBOL(register_atm_ioctl);
@@ -138,7 +137,7 @@ int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 
 	error = -ENOIOCTLCMD;
 
-	mutex_lock(&ioctl_mutex);
+	down(&ioctl_mutex);
 	list_for_each(pos, &ioctl_list) {
 		struct atm_ioctl * ic = list_entry(pos, struct atm_ioctl, list);
 		if (try_module_get(ic->owner)) {
@@ -148,7 +147,7 @@ int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 				break;
 		}
 	}
-	mutex_unlock(&ioctl_mutex);
+	up(&ioctl_mutex);
 
 	if (error != -ENOIOCTLCMD)
 		goto done;