Commit eac56c48 authored by Bodo Stroesser's avatar Bodo Stroesser Committed by Linus Torvalds

[PATCH] UML: Don't use __NR_waitpid on arches which don't have it

Some architectures (e.g. s390) don't have __NR_waitpid.
Thus, it must not be used in arch/um/kernel/tt/ptproxy/proxy.c
Signed-off-by: default avatarBodo Stroesser <bstroesser@fujitsu-siemens.com>
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent cc5f6a67
...@@ -94,7 +94,9 @@ int debugger_syscall(debugger_state *debugger, pid_t child) ...@@ -94,7 +94,9 @@ int debugger_syscall(debugger_state *debugger, pid_t child)
debugger->handle_trace = debugger_syscall; debugger->handle_trace = debugger_syscall;
return(ret); return(ret);
#ifdef __NR_waitpid
case __NR_waitpid: case __NR_waitpid:
#endif
case __NR_wait4: case __NR_wait4:
if(!debugger_wait(debugger, (int *) arg2, arg3, if(!debugger_wait(debugger, (int *) arg2, arg3,
debugger_syscall, debugger_normal_return, debugger_syscall, debugger_normal_return,
...@@ -153,7 +155,11 @@ static int parent_syscall(debugger_state *debugger, int pid) ...@@ -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, debugger_wait(&parent, (int *) arg2, arg3, parent_syscall,
parent_normal_return, parent_wait_return); parent_normal_return, parent_wait_return);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment