git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
arch
/
um
/
kernel
/
tt
/
ptproxy
/
wait.c
diff --git
a/arch/um/kernel/tt/ptproxy/wait.c
b/arch/um/kernel/tt/ptproxy/wait.c
index
86ef676
..
12f6319
100644
(file)
--- a/
arch/um/kernel/tt/ptproxy/wait.c
+++ b/
arch/um/kernel/tt/ptproxy/wait.c
@@
-9,15
+9,13
@@
terms and conditions.
#include <errno.h>
#include <signal.h>
#include <sys/wait.h>
#include <errno.h>
#include <signal.h>
#include <sys/wait.h>
-#include <sys/ptrace.h>
-#include <asm/ptrace.h>
#include "ptproxy.h"
#include "sysdep.h"
#include "wait.h"
#include "user_util.h"
#include "ptproxy.h"
#include "sysdep.h"
#include "wait.h"
#include "user_util.h"
+#include "ptrace_user.h"
#include "sysdep/ptrace.h"
#include "sysdep/ptrace.h"
-#include "sysdep/ptrace_user.h"
#include "sysdep/sigcontext.h"
int proxy_wait_return(struct debugger *debugger, pid_t unused)
#include "sysdep/sigcontext.h"
int proxy_wait_return(struct debugger *debugger, pid_t unused)
@@
-60,10
+58,10
@@
int real_wait_return(struct debugger *debugger)
pid = debugger->pid;
pid = debugger->pid;
- ip = ptrace(PTRACE_PEEKUS
E
R, pid, PT_IP_OFFSET, 0);
+ ip = ptrace(PTRACE_PEEKUSR, pid, PT_IP_OFFSET, 0);
IP_RESTART_SYSCALL(ip);
IP_RESTART_SYSCALL(ip);
- if(ptrace(PTRACE_POKEUS
E
R, pid, PT_IP_OFFSET, ip) < 0)
+ if(ptrace(PTRACE_POKEUSR, pid, PT_IP_OFFSET, ip) < 0)
tracer_panic("real_wait_return : Failed to restart system "
"call, errno = %d\n", errno);
tracer_panic("real_wait_return : Failed to restart system "
"call, errno = %d\n", errno);