[PATCH 17/20] UML - LDT mutex conversion
From: Daniel Walker <[EMAIL PROTECTED]>
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 <[EMAIL PROTECTED]>
Signed-off-by: Jeff Dike <[EMAIL PROTECTED]>
---
arch/um/sys-i386/ldt.c | 14 +++---
include/asm-um/ldt.h |4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
Index: linux-2.6.22/arch/um/sys-i386/ldt.c
===
--- linux-2.6.22.orig/arch/um/sys-i386/ldt.c2008-01-17 13:44:46.0
-0500
+++ linux-2.6.22/arch/um/sys-i386/ldt.c 2008-01-17 13:45:32.0 -0500
@@ -147,7 +147,7 @@ static int read_ldt(void __user * ptr, u
if (ptrace_ldt)
return read_ldt_from_host(ptr, bytecount);
- down(>semaphore);
+ mutex_lock(>lock);
if (ldt->entry_count <= LDT_DIRECT_ENTRIES) {
size = LDT_ENTRY_SIZE*LDT_DIRECT_ENTRIES;
if (size > bytecount)
@@ -171,7 +171,7 @@ static int read_ldt(void __user * ptr, u
ptr += size;
}
}
- up(>semaphore);
+ mutex_unlock(>lock);
if (bytecount == 0 || err == -EFAULT)
goto out;
@@ -229,7 +229,7 @@ static int write_ldt(void __user * ptr,
}
if (!ptrace_ldt)
- down(>semaphore);
+ mutex_lock(>lock);
err = write_ldt_entry(mm_idp, func, _info, , 1);
if (err)
@@ -289,7 +289,7 @@ static int write_ldt(void __user * ptr,
err = 0;
out_unlock:
- up(>semaphore);
+ mutex_unlock(>lock);
out:
return err;
}
@@ -396,7 +396,7 @@ long init_new_ldt(struct mm_context *new
if (!ptrace_ldt)
- init_MUTEX(_mm->ldt.semaphore);
+ mutex_init(_mm->ldt.lock);
if (!from_mm) {
memset(, 0, sizeof(desc));
@@ -456,7 +456,7 @@ long init_new_ldt(struct mm_context *new
* i.e., we have to use the stub for modify_ldt, which
* can't handle the big read buffer of up to 64kB.
*/
- down(_mm->ldt.semaphore);
+ mutex_lock(_mm->ldt.lock);
if (from_mm->ldt.entry_count <= LDT_DIRECT_ENTRIES)
memcpy(new_mm->ldt.u.entries, from_mm->ldt.u.entries,
sizeof(new_mm->ldt.u.entries));
@@ -475,7 +475,7 @@ long init_new_ldt(struct mm_context *new
}
}
new_mm->ldt.entry_count = from_mm->ldt.entry_count;
- up(_mm->ldt.semaphore);
+ mutex_unlock(_mm->ldt.lock);
}
out:
Index: linux-2.6.22/include/asm-um/ldt.h
===
--- linux-2.6.22.orig/include/asm-um/ldt.h 2007-11-14 10:33:41.0
-0500
+++ linux-2.6.22/include/asm-um/ldt.h 2008-01-17 13:45:32.0 -0500
@@ -8,7 +8,7 @@
#ifndef __ASM_LDT_H
#define __ASM_LDT_H
-#include "asm/semaphore.h"
+#include
#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];
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 17/20] UML - LDT mutex conversion
From: Daniel Walker [EMAIL PROTECTED]
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 [EMAIL PROTECTED]
Signed-off-by: Jeff Dike [EMAIL PROTECTED]
---
arch/um/sys-i386/ldt.c | 14 +++---
include/asm-um/ldt.h |4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
Index: linux-2.6.22/arch/um/sys-i386/ldt.c
===
--- linux-2.6.22.orig/arch/um/sys-i386/ldt.c2008-01-17 13:44:46.0
-0500
+++ linux-2.6.22/arch/um/sys-i386/ldt.c 2008-01-17 13:45:32.0 -0500
@@ -147,7 +147,7 @@ static int read_ldt(void __user * ptr, u
if (ptrace_ldt)
return read_ldt_from_host(ptr, bytecount);
- down(ldt-semaphore);
+ mutex_lock(ldt-lock);
if (ldt-entry_count = LDT_DIRECT_ENTRIES) {
size = LDT_ENTRY_SIZE*LDT_DIRECT_ENTRIES;
if (size bytecount)
@@ -171,7 +171,7 @@ static int read_ldt(void __user * ptr, u
ptr += size;
}
}
- up(ldt-semaphore);
+ mutex_unlock(ldt-lock);
if (bytecount == 0 || err == -EFAULT)
goto out;
@@ -229,7 +229,7 @@ static int write_ldt(void __user * ptr,
}
if (!ptrace_ldt)
- down(ldt-semaphore);
+ mutex_lock(ldt-lock);
err = write_ldt_entry(mm_idp, func, ldt_info, addr, 1);
if (err)
@@ -289,7 +289,7 @@ static int write_ldt(void __user * ptr,
err = 0;
out_unlock:
- up(ldt-semaphore);
+ mutex_unlock(ldt-lock);
out:
return err;
}
@@ -396,7 +396,7 @@ long init_new_ldt(struct mm_context *new
if (!ptrace_ldt)
- init_MUTEX(new_mm-ldt.semaphore);
+ mutex_init(new_mm-ldt.lock);
if (!from_mm) {
memset(desc, 0, sizeof(desc));
@@ -456,7 +456,7 @@ long init_new_ldt(struct mm_context *new
* i.e., we have to use the stub for modify_ldt, which
* can't handle the big read buffer of up to 64kB.
*/
- down(from_mm-ldt.semaphore);
+ mutex_lock(from_mm-ldt.lock);
if (from_mm-ldt.entry_count = LDT_DIRECT_ENTRIES)
memcpy(new_mm-ldt.u.entries, from_mm-ldt.u.entries,
sizeof(new_mm-ldt.u.entries));
@@ -475,7 +475,7 @@ long init_new_ldt(struct mm_context *new
}
}
new_mm-ldt.entry_count = from_mm-ldt.entry_count;
- up(from_mm-ldt.semaphore);
+ mutex_unlock(from_mm-ldt.lock);
}
out:
Index: linux-2.6.22/include/asm-um/ldt.h
===
--- linux-2.6.22.orig/include/asm-um/ldt.h 2007-11-14 10:33:41.0
-0500
+++ linux-2.6.22/include/asm-um/ldt.h 2008-01-17 13:45:32.0 -0500
@@ -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];
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
