summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1995-12-14 06:07:07 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1995-12-14 06:07:07 +0000
commit5b51ebe9ddfd07eb9bb996d962d0fe408b35cd19 (patch)
treeed07434b0429e80d1abd30bda357c9665972b100 /sys/arch
parent6239680c81028626cf4e3b4a801d154a62869a63 (diff)
from netbsd; Return 0 in the child, not the parent pid.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/i386/i386/trap.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/sys/arch/i386/i386/trap.c b/sys/arch/i386/i386/trap.c
index c6db98a5ab5..fb69df71a30 100644
--- a/sys/arch/i386/i386/trap.c
+++ b/sys/arch/i386/i386/trap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.89.2.1 1995/10/15 06:54:03 mycroft Exp $ */
+/* $NetBSD: trap.c,v 1.91 1995/12/09 05:00:27 mycroft Exp $ */
#undef DEBUG
#define DEBUG
@@ -650,16 +650,7 @@ child_return(p, frame)
struct trapframe frame;
{
-#ifdef COMPAT_LINUX
- if (p->p_emul == &emul_linux_aout || p->p_emul == &emul_linux_elf) {
- frame.tf_eax = 0;
- frame.tf_edx = 0;
- } else
-#endif
- {
- frame.tf_eax = p->p_pid;
- frame.tf_edx = 1;
- }
+ frame.tf_eax = 0;
frame.tf_eflags &= ~PSL_C;
userret(p, frame.tf_eip, 0);