dead code and symbol pollution.

3 files changed, 6 insertions, 48 deletions

diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index e64e4174996..b7d61950ad1 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_exit.c,v 1.20 1999/08/15 00:07:43 pjanzen Exp $	*/
+/*	$OpenBSD: kern_exit.c,v 1.21 2000/02/21 20:00:09 art Exp $	*/
 /*	$NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $	*/
 
 /*
@@ -117,9 +117,7 @@ exit1(p, rv)
 	if (p->p_pid == 1)
 		panic("init died (signal %d, exit %d)",
 		    WTERMSIG(rv), WEXITSTATUS(rv));
-#ifdef PGINPROF
-	vmsizmon();
-#endif
+
 	if (p->p_flag & P_PROFIL)
 		stopprofclock(p);
 	MALLOC(p->p_ru, struct rusage *, sizeof(struct rusage),
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 152dd5edb84..2ac3e9a75d7 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_fork.c,v 1.27 2000/01/31 19:57:18 deraadt Exp $	*/
+/*	$OpenBSD: kern_fork.c,v 1.28 2000/02/21 20:00:09 art Exp $	*/
 /*	$NetBSD: kern_fork.c,v 1.29 1996/02/09 18:59:34 christos Exp $	*/
 
 /*
@@ -70,6 +70,8 @@
 int	nprocs = 1;		/* process 0 */
 int	randompid;		/* when set to 1, pid's go random */
 pid_t	lastpid;
+struct	forkstat forkstat;
+
 
 /*ARGSUSED*/
 int
diff --git a/sys/sys/vmmeter.h b/sys/sys/vmmeter.h
index 523f6a29b00..797e9a2bb06 100644
--- a/sys/sys/vmmeter.h
+++ b/sys/sys/vmmeter.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmmeter.h,v 1.7 2000/02/21 19:22:52 art Exp $	*/
+/*	$OpenBSD: vmmeter.h,v 1.8 2000/02/21 20:00:08 art Exp $	*/
 /*	$NetBSD: vmmeter.h,v 1.9 1995/03/26 20:25:04 jtc Exp $	*/
 
 /*-
@@ -127,46 +127,4 @@ struct  forkstat
 	int	sizrfork;	/* VM pages affected by rfork() */
 };
 
-#ifdef _KERNEL
-struct forkstat forkstat;
-#endif
-
-/*
- * Optional instrumentation.
- */
-#ifdef PGINPROF
-
-#define	NDMON	128
-#define	NSMON	128
-
-#define	DRES	20
-#define	SRES	5
-
-#define	PMONMIN	20
-#define	PRES	50
-#define	NPMON	64
-
-#define	RMONMIN	130
-#define	RRES	5
-#define	NRMON	64
-
-/* data and stack size distribution counters */
-u_int	dmon[NDMON+1];
-u_int	smon[NSMON+1];
-
-/* page in time distribution counters */
-u_int	pmon[NPMON+2];
-
-/* reclaim time distribution counters */
-u_int	rmon[NRMON+2];
-
-int	pmonmin;
-int	pres;
-int	rmonmin;
-int	rres;
-
-u_int rectime;		/* accumulator for reclaim times */
-u_int pgintime;		/* accumulator for page in times */
-#endif
-
 #endif /* __VMMETER_H__ */