Skip to content

Commit

Permalink
uml: port mutex conversion
Browse files Browse the repository at this point in the history
The port_sem is already used as a mutex since it's using DECLARE_MUTEX(), but
the underlying construct is still a semaphore ..  This patch switches it over
to a struct mutex.

Signed-off-by: Daniel Walker <dwalker@mvista.com>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Daniel Walker authored and Linus Torvalds committed Feb 5, 2008
1 parent e98fa28 commit 2aa9c5d
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions arch/um/drivers/port_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "linux/completion.h"
#include "linux/interrupt.h"
#include "linux/list.h"
#include "linux/mutex.h"
#include "asm/atomic.h"
#include "init.h"
#include "irq_kern.h"
Expand Down Expand Up @@ -120,7 +121,7 @@ static int port_accept(struct port_list *port)
return 0;
}

static DECLARE_MUTEX(ports_sem);
static DEFINE_MUTEX(ports_mutex);
static LIST_HEAD(ports);

static void port_work_proc(struct work_struct *unused)
Expand Down Expand Up @@ -161,7 +162,7 @@ void *port_data(int port_num)
struct port_dev *dev = NULL;
int fd;

down(&ports_sem);
mutex_lock(&ports_mutex);
list_for_each(ele, &ports) {
port = list_entry(ele, struct port_list, list);
if (port->port == port_num)
Expand Down Expand Up @@ -216,7 +217,7 @@ void *port_data(int port_num)
out_free:
kfree(port);
out:
up(&ports_sem);
mutex_unlock(&ports_mutex);
return dev;
}

Expand Down

0 comments on commit 2aa9c5d

Please sign in to comment.