From: Jeff Dike <jdike@addtoit.com>
To: akpm@osdl.org
Cc: linux-kernel@vger.kernel.org, bstroesser@fujitsu-siemens.com
Subject: [PATCH 14/28] UML - Don't use __NR_waitpid on arches which don't have it
Date: Mon, 10 Jan 2005 02:35:46 -0500 [thread overview]
Message-ID: <200501100735.j0A7ZkPW005800@ccure.user-mode-linux.org> (raw)
From: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
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>
diff -puN arch/um/kernel/tt/ptproxy/proxy.c~no-__NR_waitpid arch/um/kernel/tt/ptproxy/proxy.c
--- linux-2.6.10-rc2-mm4/arch/um/kernel/tt/ptproxy/proxy.c~no-__NR_waitpid 2004-12-14 16:38:14.000000000 +0100
+++ linux-2.6.10-rc2-mm4-root/arch/um/kernel/tt/ptproxy/proxy.c 2004-12-14 16:40:26.000000000 +0100
@@ -94,7 +94,9 @@ int debugger_syscall(debugger_state *deb
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
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);
}
_
reply other threads:[~2005-01-10 5:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200501100735.j0A7ZkPW005800@ccure.user-mode-linux.org \
--to=jdike@addtoit.com \
--cc=akpm@osdl.org \
--cc=bstroesser@fujitsu-siemens.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome