[PATCH] uml: fix usage of kernel_errno in place of errno

To avoid conflicts, in kernel files errno is expanded to kernel_errno, to
distinguish it from glibc errno.  In this case, the code wants to use the libc
errno but the kernel one is used; in the other usage, we return errno in place
of -errno in case of an error.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 3 insertions, 6 deletions

diff --git a/arch/um/sys-i386/ldt.c b/arch/um/sys-i386/ldt.c
index 1fa09a79a10b..fe0877b3509c 100644
--- a/arch/um/sys-i386/ldt.c
+++ b/arch/um/sys-i386/ldt.c
@@ -107,7 +107,7 @@ long write_ldt_entry(struct mm_id * mm_idp, int func, struct user_desc * desc,
                  * So we need to switch child's mm into our userspace, then
                  * later switch back.
                  *
-                 * Note: I'm unshure: should interrupts be disabled here?
+                 * Note: I'm unsure: should interrupts be disabled here?
                  */
                 if(!current->active_mm || current->active_mm == &init_mm ||
                    mm_idp != &current->active_mm->context.skas.id)
@@ -129,9 +129,7 @@ long write_ldt_entry(struct mm_id * mm_idp, int func, struct user_desc * desc,
                         pid = userspace_pid[cpu];
                 }
 
-                res = ptrace(PTRACE_LDT, pid, 0, (unsigned long) &ldt_op);
-                if(res)
-                        res = errno;
+                res = os_ptrace_ldt(pid, 0, (unsigned long) &ldt_op);
 
                 if(proc_mm)
                         put_cpu();
@@ -181,8 +179,7 @@ static long read_ldt_from_host(void __user * ptr, unsigned long bytecount)
          */
 
         cpu = get_cpu();
-        res = ptrace(PTRACE_LDT, userspace_pid[cpu], 0,
-                     (unsigned long) &ptrace_ldt);
+        res = os_ptrace_ldt(userspace_pid[cpu], 0, (unsigned long) &ptrace_ldt);
         put_cpu();
         if(res < 0)
                 goto out;