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

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

uml: mconsole mutex conversion 



The plug_mem_mutex 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 01ac835f

arch/um/drivers/mconsole_kern.c

+4 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "linux/syscalls.h"

#include "linux/utsname.h"

#include "linux/workqueue.h"

#include "linux/mutex.h"

#include "asm/uaccess.h"

#include "init.h"

#include "irq_kern.h"
@@ -360,7 +361,7 @@ struct unplugged_pages { 
	void *pages[UNPLUGGED_PER_PAGE];

};



static DECLARE_MUTEX(plug_mem_mutex);

static DEFINE_MUTEX(plug_mem_mutex);

static unsigned long long unplugged_pages_count = 0;

static LIST_HEAD(unplugged_pages);

static int unplug_index = UNPLUGGED_PER_PAGE;
@@ -396,7 +397,7 @@ static int mem_config(char *str, char **error_out) 


	diff /= PAGE_SIZE;



	down(&plug_mem_mutex);

	mutex_lock(&plug_mem_mutex);

	for (i = 0; i < diff; i++) {

		struct unplugged_pages *unplugged;

		void *addr;
@@ -453,7 +454,7 @@ static int mem_config(char *str, char **error_out) 


	err = 0;

out_unlock:

	up(&plug_mem_mutex);

	mutex_unlock(&plug_mem_mutex);

out:

	return err;

}