vserver 2.0 rc7

[linux-2.6.git] / arch / um / sys-i386 / ptrace_user.c

diff --git a/arch/um/sys-i386/ptrace_user.c b/arch/um/sys-i386/ptrace_user.c
index 69aa6d6..7c376c9 100644 (file)
--- a/arch/um/sys-i386/ptrace_user.c
+++ b/arch/um/sys-i386/ptrace_user.c
@@ -7,8 +7,8 @@
 #include <errno.h>
 #include <unistd.h>
 #include <linux/stddef.h>
-#include <sys/ptrace.h>
-#include <asm/ptrace.h>
+#include "ptrace_user.h"
+/* Grr, asm/user.h includes asm/ptrace.h, so has to follow ptrace_user.h */
 #include <asm/user.h>
 #include "kern_util.h"
 #include "sysdep/thread.h"
@@ -52,7 +52,7 @@ static void write_debugregs(int pid, unsigned long *regs)
        nregs = sizeof(dummy->u_debugreg)/sizeof(dummy->u_debugreg[0]);
        for(i = 0; i < nregs; i++){
                if((i == 4) || (i == 5)) continue;
-               if(ptrace(PTRACE_POKEUSER, pid, &dummy->u_debugreg[i],
+               if(ptrace(PTRACE_POKEUSR, pid, &dummy->u_debugreg[i],
                          regs[i]) < 0)
                        printk("write_debugregs - ptrace failed on "
                               "register %d, value = 0x%x, errno = %d\n", i,
@@ -68,7 +68,7 @@ static void read_debugregs(int pid, unsigned long *regs)
        dummy = NULL;
        nregs = sizeof(dummy->u_debugreg)/sizeof(dummy->u_debugreg[0]);
        for(i = 0; i < nregs; i++){
-               regs[i] = ptrace(PTRACE_PEEKUSER, pid,
+               regs[i] = ptrace(PTRACE_PEEKUSR, pid,
                                 &dummy->u_debugreg[i], 0);
        }
 }