[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>

diff --git a/arch/um/kernel/tt/ptproxy/proxy.c b/arch/um/kernel/tt/ptproxy/proxy.c
index 458ecf9a45f182ac4e968233bd824edcd4a0b378..f41832c79f364dc6403d415b3b3906f5dfd3eded 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);
 
+#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);
        }