Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2aa9c5db authored by Daniel Walker's avatar Daniel Walker Committed by Linus Torvalds
Browse files

uml: port mutex conversion 



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: default avatarDaniel Walker <dwalker@mvista.com>
Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e98fa281

arch/um/drivers/port_kern.c

+4 −3
Original line number Diff line number Diff line
@@ -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"
@@ -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)
@@ -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)
@@ -216,7 +217,7 @@ void *port_data(int port_num) 
 out_free:

	kfree(port);

 out:

	up(&ports_sem);

	mutex_unlock(&ports_mutex);

	return dev;

}