summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMike Belopuhov <mikeb@cvs.openbsd.org>2012-04-11 14:38:56 +0000
committerMike Belopuhov <mikeb@cvs.openbsd.org>2012-04-11 14:38:56 +0000
commitaa8bb5b66ca2ecf4eda492f90c5a223f5b046f8e (patch)
tree31ad4ffde1a8118fb37d026089db55643046ed32 /sys/arch
parent6eacadb45a40963eac56a6cb8615584d3e9975ff (diff)
The first ktrace record for a newly spawned thread is a return
from a fork syscall done by the parent. Use __tfork, not rfork here to match the ktrace records for the parent (CALL __tfork, RET __tfork). ok guenther
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/alpha/trap.c4
-rw-r--r--sys/arch/amd64/amd64/trap.c4
-rw-r--r--sys/arch/arm/arm/syscall.c4
-rw-r--r--sys/arch/hppa/hppa/trap.c4
-rw-r--r--sys/arch/hppa64/hppa64/trap.c4
-rw-r--r--sys/arch/i386/i386/trap.c4
-rw-r--r--sys/arch/m68k/m68k/m68k_machdep.c4
-rw-r--r--sys/arch/m88k/m88k/trap.c4
-rw-r--r--sys/arch/mips64/mips64/trap.c4
-rw-r--r--sys/arch/powerpc/powerpc/trap.c4
-rw-r--r--sys/arch/sh/sh/trap.c4
-rw-r--r--sys/arch/solbourne/solbourne/trap.c4
-rw-r--r--sys/arch/sparc/sparc/trap.c4
-rw-r--r--sys/arch/sparc64/sparc64/trap.c4
-rw-r--r--sys/arch/vax/vax/trap.c4
15 files changed, 30 insertions, 30 deletions
diff --git a/sys/arch/alpha/alpha/trap.c b/sys/arch/alpha/alpha/trap.c
index 5d2229a2166..b6c4bf00b24 100644
--- a/sys/arch/alpha/alpha/trap.c
+++ b/sys/arch/alpha/alpha/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.59 2011/11/16 20:50:17 deraadt Exp $ */
+/* $OpenBSD: trap.c,v 1.60 2012/04/11 14:38:55 mikeb Exp $ */
/* $NetBSD: trap.c,v 1.52 2000/05/24 16:48:33 thorpej Exp $ */
/*-
@@ -669,7 +669,7 @@ child_return(arg)
#ifdef KTRACE
if (KTRPOINT(p, KTR_SYSRET))
ktrsysret(p,
- (p->p_flag & P_THREAD) ? SYS_rfork :
+ (p->p_flag & P_THREAD) ? SYS___tfork :
(p->p_p->ps_flags & PS_PPWAIT) ? SYS_vfork : SYS_fork,
0, 0);
#endif
diff --git a/sys/arch/amd64/amd64/trap.c b/sys/arch/amd64/amd64/trap.c
index 0d3bf9a5df5..85c969834db 100644
--- a/sys/arch/amd64/amd64/trap.c
+++ b/sys/arch/amd64/amd64/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.27 2011/11/16 20:50:18 deraadt Exp $ */
+/* $OpenBSD: trap.c,v 1.28 2012/04/11 14:38:55 mikeb Exp $ */
/* $NetBSD: trap.c,v 1.2 2003/05/04 23:51:56 fvdl Exp $ */
/*-
@@ -639,7 +639,7 @@ child_return(void *arg)
if (KTRPOINT(p, KTR_SYSRET)) {
KERNEL_LOCK();
ktrsysret(p,
- (p->p_flag & P_THREAD) ? SYS_rfork :
+ (p->p_flag & P_THREAD) ? SYS___tfork :
(p->p_p->ps_flags & PS_PPWAIT) ? SYS_vfork : SYS_fork,
0, 0);
KERNEL_UNLOCK();
diff --git a/sys/arch/arm/arm/syscall.c b/sys/arch/arm/arm/syscall.c
index 3b242d13dec..655139c521a 100644
--- a/sys/arch/arm/arm/syscall.c
+++ b/sys/arch/arm/arm/syscall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscall.c,v 1.13 2011/09/20 22:02:11 miod Exp $ */
+/* $OpenBSD: syscall.c,v 1.14 2012/04/11 14:38:55 mikeb Exp $ */
/* $NetBSD: syscall.c,v 1.24 2003/11/14 19:03:17 scw Exp $ */
/*-
@@ -217,7 +217,7 @@ child_return(arg)
#ifdef KTRACE
if (KTRPOINT(p, KTR_SYSRET)) {
ktrsysret(p,
- (p->p_flag & P_THREAD) ? SYS_rfork :
+ (p->p_flag & P_THREAD) ? SYS___tfork :
(p->p_p->ps_flags & PS_PPWAIT) ? SYS_vfork : SYS_fork,
0, 0);
}
diff --git a/sys/arch/hppa/hppa/trap.c b/sys/arch/hppa/hppa/trap.c
index c3b63237568..8ebf286f463 100644
--- a/sys/arch/hppa/hppa/trap.c
+++ b/sys/arch/hppa/hppa/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.121 2011/11/16 20:56:01 deraadt Exp $ */
+/* $OpenBSD: trap.c,v 1.122 2012/04/11 14:38:55 mikeb Exp $ */
/*
* Copyright (c) 1998-2004 Michael Shalayeff
@@ -664,7 +664,7 @@ child_return(void *arg)
if (KTRPOINT(p, KTR_SYSRET)) {
KERNEL_LOCK();
ktrsysret(p,
- (p->p_flag & P_THREAD) ? SYS_rfork :
+ (p->p_flag & P_THREAD) ? SYS___tfork :
(p->p_p->ps_flags & PS_PPWAIT) ? SYS_vfork : SYS_fork,
0, 0);
KERNEL_UNLOCK();
diff --git a/sys/arch/hppa64/hppa64/trap.c b/sys/arch/hppa64/hppa64/trap.c
index d51de198990..6499e43d94f 100644
--- a/sys/arch/hppa64/hppa64/trap.c
+++ b/sys/arch/hppa64/hppa64/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.29 2011/11/26 19:14:17 kettenis Exp $ */
+/* $OpenBSD: trap.c,v 1.30 2012/04/11 14:38:55 mikeb Exp $ */
/*
* Copyright (c) 2005 Michael Shalayeff
@@ -555,7 +555,7 @@ child_return(void *arg)
#ifdef KTRACE
if (KTRPOINT(p, KTR_SYSRET))
ktrsysret(p,
- (p->p_flag & P_THREAD) ? SYS_rfork :
+ (p->p_flag & P_THREAD) ? SYS___tfork :
(p->p_p->ps_flags & PS_PPWAIT) ? SYS_vfork : SYS_fork,
0, 0);
#endif
diff --git a/sys/arch/i386/i386/trap.c b/sys/arch/i386/i386/trap.c
index 488258a99b5..7e8e867c9b7 100644
--- a/sys/arch/i386/i386/trap.c
+++ b/sys/arch/i386/i386/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.101 2011/11/16 20:50:18 deraadt Exp $ */
+/* $OpenBSD: trap.c,v 1.102 2012/04/11 14:38:55 mikeb Exp $ */
/* $NetBSD: trap.c,v 1.95 1996/05/05 06:50:02 mycroft Exp $ */
/*-
@@ -749,7 +749,7 @@ child_return(void *arg)
if (KTRPOINT(p, KTR_SYSRET)) {
KERNEL_LOCK();
ktrsysret(p,
- (p->p_flag & P_THREAD) ? SYS_rfork :
+ (p->p_flag & P_THREAD) ? SYS___tfork :
(p->p_p->ps_flags & PS_PPWAIT) ? SYS_vfork : SYS_fork,
0, 0);
KERNEL_UNLOCK();
diff --git a/sys/arch/m68k/m68k/m68k_machdep.c b/sys/arch/m68k/m68k/m68k_machdep.c
index 595d5c4545f..30251fcddd2 100644
--- a/sys/arch/m68k/m68k/m68k_machdep.c
+++ b/sys/arch/m68k/m68k/m68k_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: m68k_machdep.c,v 1.15 2011/04/03 14:56:28 guenther Exp $ */
+/* $OpenBSD: m68k_machdep.c,v 1.16 2012/04/11 14:38:55 mikeb Exp $ */
/* $NetBSD: m68k_machdep.c,v 1.3 1997/06/12 09:57:04 veego Exp $ */
/*-
@@ -89,7 +89,7 @@ child_return(arg)
#ifdef KTRACE
if (KTRPOINT(p, KTR_SYSRET))
ktrsysret(p,
- (p->p_flag & P_THREAD) ? SYS_rfork :
+ (p->p_flag & P_THREAD) ? SYS___tfork :
(p->p_p->ps_flags & PS_PPWAIT) ? SYS_vfork : SYS_fork,
0, 0);
#endif
diff --git a/sys/arch/m88k/m88k/trap.c b/sys/arch/m88k/m88k/trap.c
index 9ebdf92aba3..2cad56abb1d 100644
--- a/sys/arch/m88k/m88k/trap.c
+++ b/sys/arch/m88k/m88k/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.79 2011/11/16 20:50:18 deraadt Exp $ */
+/* $OpenBSD: trap.c,v 1.80 2012/04/11 14:38:55 mikeb Exp $ */
/*
* Copyright (c) 2004, Miodrag Vallat.
* Copyright (c) 1998 Steve Murphree, Jr.
@@ -1496,7 +1496,7 @@ child_return(arg)
if (KTRPOINT(p, KTR_SYSRET)) {
KERNEL_LOCK();
ktrsysret(p,
- (p->p_flag & P_THREAD) ? SYS_rfork :
+ (p->p_flag & P_THREAD) ? SYS___tfork :
(p->p_p->ps_flags & PS_PPWAIT) ? SYS_vfork : SYS_fork,
0, 0);
KERNEL_UNLOCK();
diff --git a/sys/arch/mips64/mips64/trap.c b/sys/arch/mips64/mips64/trap.c
index e72715c71f1..66725092ad3 100644
--- a/sys/arch/mips64/mips64/trap.c
+++ b/sys/arch/mips64/mips64/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.80 2012/04/10 15:59:21 miod Exp $ */
+/* $OpenBSD: trap.c,v 1.81 2012/04/11 14:38:55 mikeb Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -852,7 +852,7 @@ child_return(arg)
if (KTRPOINT(p, KTR_SYSRET)) {
KERNEL_LOCK();
ktrsysret(p,
- (p->p_flag & P_THREAD) ? SYS_rfork :
+ (p->p_flag & P_THREAD) ? SYS___tfork :
(p->p_p->ps_flags & PS_PPWAIT) ? SYS_vfork : SYS_fork,
0, 0);
KERNEL_UNLOCK();
diff --git a/sys/arch/powerpc/powerpc/trap.c b/sys/arch/powerpc/powerpc/trap.c
index e6e595a590a..8f511c76951 100644
--- a/sys/arch/powerpc/powerpc/trap.c
+++ b/sys/arch/powerpc/powerpc/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.89 2011/11/16 20:50:19 deraadt Exp $ */
+/* $OpenBSD: trap.c,v 1.90 2012/04/11 14:38:55 mikeb Exp $ */
/* $NetBSD: trap.c,v 1.3 1996/10/13 03:31:37 christos Exp $ */
/*
@@ -722,7 +722,7 @@ child_return(void *arg)
if (KTRPOINT(p, KTR_SYSRET)) {
KERNEL_LOCK();
ktrsysret(p,
- (p->p_flag & P_THREAD) ? SYS_rfork :
+ (p->p_flag & P_THREAD) ? SYS___tfork :
(p->p_p->ps_flags & PS_PPWAIT) ? SYS_vfork : SYS_fork,
0, 0);
KERNEL_UNLOCK();
diff --git a/sys/arch/sh/sh/trap.c b/sys/arch/sh/sh/trap.c
index 20125ae34a6..826dc4b71d3 100644
--- a/sys/arch/sh/sh/trap.c
+++ b/sys/arch/sh/sh/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.18 2011/11/16 20:50:19 deraadt Exp $ */
+/* $OpenBSD: trap.c,v 1.19 2012/04/11 14:38:55 mikeb Exp $ */
/* $NetBSD: exception.c,v 1.32 2006/09/04 23:57:52 uwe Exp $ */
/* $NetBSD: syscall.c,v 1.6 2006/03/07 07:21:50 thorpej Exp $ */
@@ -693,7 +693,7 @@ child_return(void *arg)
#ifdef KTRACE
if (KTRPOINT(p, KTR_SYSRET))
ktrsysret(p,
- (p->p_flag & P_THREAD) ? SYS_rfork :
+ (p->p_flag & P_THREAD) ? SYS___tfork :
(p->p_p->ps_flags & PS_PPWAIT) ? SYS_vfork : SYS_fork,
0, 0);
#endif
diff --git a/sys/arch/solbourne/solbourne/trap.c b/sys/arch/solbourne/solbourne/trap.c
index e894d945582..d80811eb4db 100644
--- a/sys/arch/solbourne/solbourne/trap.c
+++ b/sys/arch/solbourne/solbourne/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.14 2011/11/16 20:50:19 deraadt Exp $ */
+/* $OpenBSD: trap.c,v 1.15 2012/04/11 14:38:55 mikeb Exp $ */
/* OpenBSD: trap.c,v 1.42 2004/12/06 20:12:25 miod Exp */
/*
@@ -927,7 +927,7 @@ child_return(arg)
#ifdef KTRACE
if (KTRPOINT(p, KTR_SYSRET))
ktrsysret(p,
- (p->p_flag & P_THREAD) ? SYS_rfork :
+ (p->p_flag & P_THREAD) ? SYS___tfork :
(p->p_p->ps_flags & PS_PPWAIT) ? SYS_vfork : SYS_fork,
0, 0);
#endif
diff --git a/sys/arch/sparc/sparc/trap.c b/sys/arch/sparc/sparc/trap.c
index 7fd71976303..d659e228cb1 100644
--- a/sys/arch/sparc/sparc/trap.c
+++ b/sys/arch/sparc/sparc/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.58 2011/11/16 20:50:19 deraadt Exp $ */
+/* $OpenBSD: trap.c,v 1.59 2012/04/11 14:38:55 mikeb Exp $ */
/* $NetBSD: trap.c,v 1.58 1997/09/12 08:55:01 pk Exp $ */
/*
@@ -1110,7 +1110,7 @@ child_return(arg)
#ifdef KTRACE
if (KTRPOINT(p, KTR_SYSRET))
ktrsysret(p,
- (p->p_flag & P_THREAD) ? SYS_rfork :
+ (p->p_flag & P_THREAD) ? SYS___tfork :
(p->p_p->ps_flags & PS_PPWAIT) ? SYS_vfork : SYS_fork,
0, 0);
#endif
diff --git a/sys/arch/sparc64/sparc64/trap.c b/sys/arch/sparc64/sparc64/trap.c
index 453436bb724..df20ef0db5e 100644
--- a/sys/arch/sparc64/sparc64/trap.c
+++ b/sys/arch/sparc64/sparc64/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.74 2011/11/16 20:50:19 deraadt Exp $ */
+/* $OpenBSD: trap.c,v 1.75 2012/04/11 14:38:55 mikeb Exp $ */
/* $NetBSD: trap.c,v 1.73 2001/08/09 01:03:01 eeh Exp $ */
/*
@@ -1421,7 +1421,7 @@ child_return(arg)
if (KTRPOINT(p, KTR_SYSRET)) {
KERNEL_LOCK();
ktrsysret(p,
- (p->p_flag & P_THREAD) ? SYS_rfork :
+ (p->p_flag & P_THREAD) ? SYS___tfork :
(p->p_p->ps_flags & PS_PPWAIT) ? SYS_vfork : SYS_fork,
0, 0);
KERNEL_UNLOCK();
diff --git a/sys/arch/vax/vax/trap.c b/sys/arch/vax/vax/trap.c
index b25427c945c..8da67a05304 100644
--- a/sys/arch/vax/vax/trap.c
+++ b/sys/arch/vax/vax/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.42 2011/11/16 20:50:19 deraadt Exp $ */
+/* $OpenBSD: trap.c,v 1.43 2012/04/11 14:38:55 mikeb Exp $ */
/* $NetBSD: trap.c,v 1.47 1999/08/21 19:26:20 matt Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -442,7 +442,7 @@ child_return(arg)
#ifdef KTRACE
if (KTRPOINT(p, KTR_SYSRET))
ktrsysret(p,
- (p->p_flag & P_THREAD) ? SYS_rfork :
+ (p->p_flag & P_THREAD) ? SYS___tfork :
(p->p_p->ps_flags & PS_PPWAIT) ? SYS_vfork : SYS_fork,
0, 0);
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 01:39:27 +0000