summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguenther <guenther@openbsd.org>2012-07-17 21:59:56 +0000
committerguenther <guenther@openbsd.org>2012-07-17 21:59:56 +0000
commitcb0c24d745896298c3c93f0a6d072a02a70a850f (patch)
tree3248e3279ede6166dfbd32c62564945f89fd2be4
parentsync (diff)
downloadwireguard-openbsd-cb0c24d745896298c3c93f0a6d072a02a70a850f.tar.xz
wireguard-openbsd-cb0c24d745896298c3c93f0a6d072a02a70a850f.zip
p_prof_ticks accidentally got moved from a 'copy-on-fork' area
(when it was in struct pstats) to an 'uninitialized-on-fork' area (in struct proc), thus resulting in the counts all being off. Put it and p_prof_addr back in a 'copy-on-fork' area. ok matthew@ miod@ weingart@
-rw-r--r--sys/sys/proc.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index d192883430b..b4f24dec40e 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.h,v 1.160 2012/07/11 08:45:21 guenther Exp $ */
+/* $OpenBSD: proc.h,v 1.161 2012/07/17 21:59:56 guenther Exp $ */
/* $NetBSD: proc.h,v 1.44 1996/04/22 01:23:21 christos Exp $ */
/*-
@@ -330,6 +330,9 @@ struct proc {
struct sigaltstack p_sigstk; /* sp & on stack state variable */
vaddr_t p_sigcode; /* user pointer to the signal code. */
+ u_long p_prof_addr; /* tmp storage for profiling addr until AST */
+ u_long p_prof_ticks; /* tmp storage for profiling ticks until AST */
+
/* End area that is copied on creation. */
#define p_endcopy p_addr
@@ -342,9 +345,6 @@ struct proc {
int p_sicode; /* For core dump/debugger XXX */
long p_sitrapno; /* For core dump/debugger XXX */
- u_long p_prof_addr; /* temp storage for profiling addr util AST */
- u_long p_prof_ticks; /* temp storage for profiling ticks util AST */
-
u_short p_xstat; /* Exit status for wait; also stop signal. */
};