summaryrefslogtreecommitdiffstats
path: root/include/asm-um
diff options
context:
space:
mode:
authorDaniel Walker <dwalker@mvista.com>2008-02-04 22:31:26 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-05 09:44:31 -0800
commit01ac835fdd121f36dded404af15225101f6ccee3 (patch)
tree7c147e37003fdad5525ce4b036917a29d9cdd1a2 /include/asm-um
parent2278c5ac9d39699bac44250b9c532de0c02cb16a (diff)
downloadop-kernel-dev-01ac835fdd121f36dded404af15225101f6ccee3.zip
op-kernel-dev-01ac835fdd121f36dded404af15225101f6ccee3.tar.gz
uml: LDT mutex conversion
The ldt.semaphore conforms to the new struct mutex requirments, so I converted it to use the new API and changed the name. 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>
Diffstat (limited to 'include/asm-um')
-rw-r--r--include/asm-um/ldt.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-um/ldt.h b/include/asm-um/ldt.h
index b2553f3..52af512 100644
--- a/include/asm-um/ldt.h
+++ b/include/asm-um/ldt.h
@@ -8,7 +8,7 @@
#ifndef __ASM_LDT_H
#define __ASM_LDT_H
-#include "asm/semaphore.h"
+#include <linux/mutex.h>
#include "asm/host_ldt.h"
extern void ldt_host_info(void);
@@ -27,7 +27,7 @@ struct ldt_entry {
typedef struct uml_ldt {
int entry_count;
- struct semaphore semaphore;
+ struct mutex lock;
union {
struct ldt_entry * pages[LDT_PAGES_MAX];
struct ldt_entry entries[LDT_DIRECT_ENTRIES];
OpenPOWER on IntegriCloud