vserver 2.0 rc7

[linux-2.6.git] / arch / um / kernel / tt / ptproxy / sysdep.c

diff --git a/arch/um/kernel/tt/ptproxy/sysdep.c b/arch/um/kernel/tt/ptproxy/sysdep.c
index 4545ea4..a5f0e01 100644 (file)
--- a/arch/um/kernel/tt/ptproxy/sysdep.c
+++ b/arch/um/kernel/tt/ptproxy/sysdep.c
@@ -11,7 +11,6 @@ terms and conditions.
 #include <signal.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/ptrace.h>
 #include <linux/unistd.h>
 #include "ptrace_user.h"
 #include "user_util.h"
@@ -20,21 +19,21 @@ terms and conditions.
 int get_syscall(pid_t pid, long *arg1, long *arg2, long *arg3, long *arg4, 
                long *arg5)
 {
-       *arg1 = ptrace(PTRACE_PEEKUSER, pid, PT_SYSCALL_ARG1_OFFSET, 0);
-       *arg2 = ptrace(PTRACE_PEEKUSER, pid, PT_SYSCALL_ARG2_OFFSET, 0);
-       *arg3 = ptrace(PTRACE_PEEKUSER, pid, PT_SYSCALL_ARG3_OFFSET, 0);
-       *arg4 = ptrace(PTRACE_PEEKUSER, pid, PT_SYSCALL_ARG4_OFFSET, 0);
-       *arg5 = ptrace(PTRACE_PEEKUSER, pid, PT_SYSCALL_ARG5_OFFSET, 0);
-       return(ptrace(PTRACE_PEEKUSER, pid, PT_SYSCALL_NR_OFFSET, 0));
+       *arg1 = ptrace(PTRACE_PEEKUSR, pid, PT_SYSCALL_ARG1_OFFSET, 0);
+       *arg2 = ptrace(PTRACE_PEEKUSR, pid, PT_SYSCALL_ARG2_OFFSET, 0);
+       *arg3 = ptrace(PTRACE_PEEKUSR, pid, PT_SYSCALL_ARG3_OFFSET, 0);
+       *arg4 = ptrace(PTRACE_PEEKUSR, pid, PT_SYSCALL_ARG4_OFFSET, 0);
+       *arg5 = ptrace(PTRACE_PEEKUSR, pid, PT_SYSCALL_ARG5_OFFSET, 0);
+       return(ptrace(PTRACE_PEEKUSR, pid, PT_SYSCALL_NR_OFFSET, 0));
 }
 
 void syscall_cancel(pid_t pid, int result)
 {
-       if((ptrace(PTRACE_POKEUSER, pid, PT_SYSCALL_NR_OFFSET, 
+       if((ptrace(PTRACE_POKEUSR, pid, PT_SYSCALL_NR_OFFSET,
                   __NR_getpid) < 0) ||
           (ptrace(PTRACE_SYSCALL, pid, 0, 0) < 0) ||
           (wait_for_stop(pid, SIGTRAP, PTRACE_SYSCALL, NULL) < 0) ||
-          (ptrace(PTRACE_POKEUSER, pid, PT_SYSCALL_RET_OFFSET, result) < 0) ||
+          (ptrace(PTRACE_POKEUSR, pid, PT_SYSCALL_RET_OFFSET, result) < 0) ||
           (ptrace(PTRACE_SYSCALL, pid, 0, 0) < 0))
                printk("ptproxy: couldn't cancel syscall: errno = %d\n", 
                       errno);
@@ -42,7 +41,7 @@ void syscall_cancel(pid_t pid, int result)
 
 void syscall_set_result(pid_t pid, long result)
 {
-       ptrace(PTRACE_POKEUSER, pid, PT_SYSCALL_RET_OFFSET, result);
+       ptrace(PTRACE_POKEUSR, pid, PT_SYSCALL_RET_OFFSET, result);
 }
 
 void syscall_continue(pid_t pid)
@@ -52,7 +51,7 @@ void syscall_continue(pid_t pid)
 
 int syscall_pause(pid_t pid) 
 {
-       if(ptrace(PTRACE_POKEUSER, pid, PT_SYSCALL_NR_OFFSET, __NR_pause) < 0){
+       if(ptrace(PTRACE_POKEUSR, pid, PT_SYSCALL_NR_OFFSET, __NR_pause) < 0){
                printk("syscall_change - ptrace failed, errno = %d\n", errno);
                return(-1);
        }