diff options
| author | Bodo Stroesser <bstroesser@fujitsu-siemens.com> | 2005-01-11 03:14:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-11 03:14:22 -0800 |
| commit | eac56c48447816d89c81d042a35427c4c7d51dd7 (patch) | |
| tree | b48beb61b91d3a84b5eb9c9a7ed2eb5ba5a11db4 /arch | |
| parent | cc5f6a674e75fb6b4608c08203d7b00125758f72 (diff) | |
| download | history-eac56c48447816d89c81d042a35427c4c7d51dd7.tar.gz | |
[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: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/kernel/tt/ptproxy/proxy.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/um/kernel/tt/ptproxy/proxy.c b/arch/um/kernel/tt/ptproxy/proxy.c index 458ecf9a45f182..f41832c79f364d 100644 --- 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); +#ifdef __NR_waitpid case __NR_waitpid: +#endif 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); - 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); } |