Unstaticize psratio and staticize profprocs. psratio needs to be exported

to trap.c to fix user profiling.

4 files changed, 20 insertions, 16 deletions

diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 3a92899..ff14269 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.23 1995/12/07 12:46:37 davidg Exp $
+ * $Id: kern_clock.c,v 1.24 1995/12/17 21:23:16 phk Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -83,10 +83,11 @@
 static void initclocks __P((void *dummy));
 SYSINIT(clocks, SI_SUB_CLOCKS, SI_ORDER_FIRST, initclocks, NULL)
 
-/* Does anybody else really care about these? (yes, machdep.c) */
-static struct callout calltodo;
+/* Exported to machdep.c. */
 struct callout *callfree, *callout;
 
+static struct callout calltodo;
+
 /* Some of these don't belong here, but it's easiest to concentrate them. */
 static long cp_time[CPUSTATES];
 long dk_seek[DK_NDRIVE];
@@ -149,10 +150,10 @@ long tk_rawcc;
 
 int	stathz;
 int	profhz;
-int	profprocs;
+static int profprocs;
 int	ticks;
 static int psdiv, pscnt;	/* prof => stat divider */
-static int psratio;		/* ratio: prof / stat */
+int psratio;			/* ratio: prof / stat */
 
 volatile struct	timeval time;
 volatile struct	timeval mono_time;
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index 3a92899..ff14269 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.23 1995/12/07 12:46:37 davidg Exp $
+ * $Id: kern_clock.c,v 1.24 1995/12/17 21:23:16 phk Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -83,10 +83,11 @@
 static void initclocks __P((void *dummy));
 SYSINIT(clocks, SI_SUB_CLOCKS, SI_ORDER_FIRST, initclocks, NULL)
 
-/* Does anybody else really care about these? (yes, machdep.c) */
-static struct callout calltodo;
+/* Exported to machdep.c. */
 struct callout *callfree, *callout;
 
+static struct callout calltodo;
+
 /* Some of these don't belong here, but it's easiest to concentrate them. */
 static long cp_time[CPUSTATES];
 long dk_seek[DK_NDRIVE];
@@ -149,10 +150,10 @@ long tk_rawcc;
 
 int	stathz;
 int	profhz;
-int	profprocs;
+static int profprocs;
 int	ticks;
 static int psdiv, pscnt;	/* prof => stat divider */
-static int psratio;		/* ratio: prof / stat */
+int psratio;			/* ratio: prof / stat */
 
 volatile struct	timeval time;
 volatile struct	timeval mono_time;
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index 3a92899..ff14269 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.23 1995/12/07 12:46:37 davidg Exp $
+ * $Id: kern_clock.c,v 1.24 1995/12/17 21:23:16 phk Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -83,10 +83,11 @@
 static void initclocks __P((void *dummy));
 SYSINIT(clocks, SI_SUB_CLOCKS, SI_ORDER_FIRST, initclocks, NULL)
 
-/* Does anybody else really care about these? (yes, machdep.c) */
-static struct callout calltodo;
+/* Exported to machdep.c. */
 struct callout *callfree, *callout;
 
+static struct callout calltodo;
+
 /* Some of these don't belong here, but it's easiest to concentrate them. */
 static long cp_time[CPUSTATES];
 long dk_seek[DK_NDRIVE];
@@ -149,10 +150,10 @@ long tk_rawcc;
 
 int	stathz;
 int	profhz;
-int	profprocs;
+static int profprocs;
 int	ticks;
 static int psdiv, pscnt;	/* prof => stat divider */
-static int psratio;		/* ratio: prof / stat */
+int psratio;			/* ratio: prof / stat */
 
 volatile struct	timeval time;
 volatile struct	timeval mono_time;
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index bac7c24..e0cc5bb 100644
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernel.h	8.3 (Berkeley) 1/21/94
- * $Id: kernel.h,v 1.18 1995/12/16 21:50:15 bde Exp $
+ * $Id: kernel.h,v 1.19 1996/01/30 23:00:46 mpp Exp $
  */
 
 #ifndef _SYS_KERNEL_H_
@@ -64,6 +64,7 @@ extern struct timezone tz;			/* XXX */
 
 extern int tick;			/* usec per tick (1000000 / hz) */
 extern int hz;				/* system clock's frequency */
+extern int psratio;			/* ratio: prof / stat */
 extern int stathz;			/* statistics clock's frequency */
 extern int profhz;			/* profiling clock's frequency */
 extern int ticks;