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 1.9.5.x5
[linux-2.6.git]
/
arch
/
um
/
kernel
/
tt
/
ptproxy
/
proxy.c
diff --git
a/arch/um/kernel/tt/ptproxy/proxy.c
b/arch/um/kernel/tt/ptproxy/proxy.c
index
458ecf9
..
f41832c
100644
(file)
--- a/
arch/um/kernel/tt/ptproxy/proxy.c
+++ b/
arch/um/kernel/tt/ptproxy/proxy.c
@@
-94,7
+94,9
@@
int debugger_syscall(debugger_state *debugger, pid_t child)
debugger->handle_trace = debugger_syscall;
return(ret);
debugger->handle_trace = debugger_syscall;
return(ret);
+#ifdef __NR_waitpid
case __NR_waitpid:
case __NR_waitpid:
+#endif
case __NR_wait4:
if(!debugger_wait(debugger, (int *) arg2, arg3,
debugger_syscall, debugger_normal_return,
case __NR_wait4:
if(!debugger_wait(debugger, (int *) arg2, arg3,
debugger_syscall, debugger_normal_return,
@@
-153,7
+155,11
@@
static int parent_syscall(debugger_state *debugger, int pid)
syscall = get_syscall(pid, &arg1, &arg2, &arg3, &arg4, &arg5);
syscall = get_syscall(pid, &arg1, &arg2, &arg3, &arg4, &arg5);
- if((syscall == __NR_waitpid) || (syscall == __NR_wait4)){
+ if((syscall == __NR_wait4)
+#ifdef __NR_waitpid
+ || (syscall == __NR_waitpid)
+#endif
+ ){
debugger_wait(&parent, (int *) arg2, arg3, parent_syscall,
parent_normal_return, parent_wait_return);
}
debugger_wait(&parent, (int *) arg2, arg3, parent_syscall,
parent_normal_return, parent_wait_return);
}