lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

uml: mconsole mutex conversion

Browse Source 
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: 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>
This commit is contained in:
Daniel Walker
2008-02-04 22:31:27 -08:00
committed by Linus Torvalds
parent 01ac835fdd
commit e98fa28160
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/um/drivers/mconsole_kern.c
View File

@@ -17,6 +17,7 @@
#include "linux/syscalls.h" #include "linux/syscalls.h"
#include "linux/utsname.h" #include "linux/utsname.h"
#include "linux/workqueue.h" #include "linux/workqueue.h"
#include "linux/mutex.h"
#include "asm/uaccess.h" #include "asm/uaccess.h"
#include "init.h" #include "init.h"
#include "irq_kern.h" #include "irq_kern.h"
@@ -360,7 +361,7 @@ struct unplugged_pages {
void *pages[UNPLUGGED_PER_PAGE]; 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 unsigned long long unplugged_pages_count = 0;
static LIST_HEAD(unplugged_pages); static LIST_HEAD(unplugged_pages);
static int unplug_index = UNPLUGGED_PER_PAGE; static int unplug_index = UNPLUGGED_PER_PAGE;
@@ -396,7 +397,7 @@ static int mem_config(char *str, char **error_out)
diff /= PAGE_SIZE; diff /= PAGE_SIZE;
down(&plug_mem_mutex); mutex_lock(&plug_mem_mutex);
for (i = 0; i < diff; i++) { for (i = 0; i < diff; i++) {
struct unplugged_pages *unplugged; struct unplugged_pages *unplugged;
void *addr; void *addr;
@@ -453,7 +454,7 @@ static int mem_config(char *str, char **error_out)
err = 0; err = 0;
out_unlock: out_unlock:
up(&plug_mem_mutex); mutex_unlock(&plug_mem_mutex);
out: out:
return err; return err;
} }