diff options
| author | Daniel Walker <dwalker@mvista.com> | 2008-02-05 01:31:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:31 -0500 |
| commit | 01ac835fdd121f36dded404af15225101f6ccee3 (patch) | |
| tree | 7c147e37003fdad5525ce4b036917a29d9cdd1a2 /include/asm-um | |
| parent | 2278c5ac9d39699bac44250b9c532de0c02cb16a (diff) | |
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.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-um/ldt.h b/include/asm-um/ldt.h index b2553f3e87eb..52af512f5e7d 100644 --- a/include/asm-um/ldt.h +++ b/include/asm-um/ldt.h | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #ifndef __ASM_LDT_H | 8 | #ifndef __ASM_LDT_H |
| 9 | #define __ASM_LDT_H | 9 | #define __ASM_LDT_H |
| 10 | 10 | ||
| 11 | #include "asm/semaphore.h" | 11 | #include <linux/mutex.h> |
| 12 | #include "asm/host_ldt.h" | 12 | #include "asm/host_ldt.h" |
| 13 | 13 | ||
| 14 | extern void ldt_host_info(void); | 14 | extern void ldt_host_info(void); |
| @@ -27,7 +27,7 @@ struct ldt_entry { | |||
| 27 | 27 | ||
| 28 | typedef struct uml_ldt { | 28 | typedef struct uml_ldt { |
| 29 | int entry_count; | 29 | int entry_count; |
| 30 | struct semaphore semaphore; | 30 | struct mutex lock; |
| 31 | union { | 31 | union { |
| 32 | struct ldt_entry * pages[LDT_PAGES_MAX]; | 32 | struct ldt_entry * pages[LDT_PAGES_MAX]; |
| 33 | struct ldt_entry entries[LDT_DIRECT_ENTRIES]; | 33 | struct ldt_entry entries[LDT_DIRECT_ENTRIES]; |
