diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-02-27 13:27:34 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-02-27 13:27:34 -0500 |
| commit | f3b270a47882b958e9e3c5bd86894e3a7072899a (patch) | |
| tree | de3bdfd5d67e8310257b93ac3d8d703599b9d929 /arch/um/sys-i386/ldt.c | |
| parent | 116ad29d9839610d2811a1962cac7f3f2a9f9295 (diff) | |
| parent | b9a33cebac70d6f67a769ce8d4078fee2b254ada (diff) | |
| download | linux-f3b270a47882b958e9e3c5bd86894e3a7072899a.tar.gz | |
Merge branch 'master'
Diffstat (limited to 'arch/um/sys-i386/ldt.c')
| -rw-r--r-- | arch/um/sys-i386/ldt.c | 9 |
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 != ¤t->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; |