move HPUXCOMPAT code to MD files and account for new stack alignment

[unix-history] / usr / src / sys / kern / kern_clock.c

diff --git a/usr/src/sys/kern/kern_clock.c b/usr/src/sys/kern/kern_clock.c
index f341d15..9873bb3 100644 (file)
--- a/usr/src/sys/kern/kern_clock.c
+++ b/usr/src/sys/kern/kern_clock.c
@@ -4,21 +4,21 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)kern_clock.c        7.24 (Berkeley) %G%
+ *     @(#)kern_clock.c        7.28 (Berkeley) %G%

  */
 
  */
 

-#include "param.h"
-#include "systm.h"
-#include "dkstat.h"
-#include "callout.h"
-#include "kernel.h"
-#include "proc.h"
-#include "resourcevar.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/dkstat.h>
+#include <sys/callout.h>
+#include <sys/kernel.h>
+#include <sys/proc.h>
+#include <sys/resourcevar.h>

 
 

-#include "machine/cpu.h"
+#include <machine/cpu.h>

 
 #ifdef GPROF
 
 #ifdef GPROF

-#include "gmon.h"
+#include <sys/gmon.h>

 extern u_short *kcount;
 #endif
 
 extern u_short *kcount;
 #endif
 


@@ -72,7 +72,9 @@ int   adjtimedelta;
 int    stathz;
 int    profhz;
 int    profprocs;
 int    stathz;
 int    profhz;
 int    profprocs;

-static int psratio, psdiv, pscnt;      /* prof => stat divider */
+int    ticks;
+static int psdiv, pscnt;       /* prof => stat divider */
+int    psratio;                /* ratio: prof / stat */

 
 volatile struct        timeval time;
 volatile struct        timeval mono_time;
 
 volatile struct        timeval time;
 volatile struct        timeval mono_time;


@@ -151,6 +153,7 @@ hardclock(frame)
         * Increment the time-of-day.  The increment is just ``tick'' unless
         * we are still adjusting the clock; see adjtime().
         */
         * Increment the time-of-day.  The increment is just ``tick'' unless
         * we are still adjusting the clock; see adjtime().
         */

+       ticks++;

 #ifdef ADJTIME
        if (adjtimedelta == 0)
                bumptime(&time, tick);
 #ifdef ADJTIME
        if (adjtimedelta == 0)
                bumptime(&time, tick);