summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>2004-08-14 00:14:12 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>2004-08-14 00:14:12 +0000
commitd41ec12419fb4532031757fede7baa1338382860 (patch)
tree8826a17d67576d0356b6817d4e981640d1e41352
parent07fa38957de104303b5d82b672ec8b1442fffba8 (diff)
bad bad typo + thinko made ktrace broken in smp. ok deraadt@
-rw-r--r--sys/arch/i386/i386/trap.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/i386/i386/trap.c b/sys/arch/i386/i386/trap.c
index 5a5541184b6..ca0713f6da1 100644
--- a/sys/arch/i386/i386/trap.c
+++ b/sys/arch/i386/i386/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.64 2004/07/02 16:29:55 niklas Exp $ */
+/* $OpenBSD: trap.c,v 1.65 2004/08/14 00:14:11 niklas Exp $ */
/* $NetBSD: trap.c,v 1.95 1996/05/05 06:50:02 mycroft Exp $ */
/*-
@@ -856,15 +856,14 @@ child_return(arg)
tf->tf_eax = 0;
tf->tf_eflags &= ~PSL_C;
-#ifdef notyet
KERNEL_PROC_UNLOCK(p);
-#endif
userret(p, tf->tf_eip, 0);
#ifdef KTRACE
- if (KTRPOINT(p, KTR_SYSRET))
+ if (KTRPOINT(p, KTR_SYSRET)) {
KERNEL_PROC_LOCK(p);
ktrsysret(p, SYS_fork, 0, 0);
KERNEL_PROC_UNLOCK(p);
+ }
#endif
}