update from Rick Macklem to generate proper error messages

[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 54413c9..c8dfcce 100644 (file)
--- a/usr/src/sys/kern/kern_clock.c
+++ b/usr/src/sys/kern/kern_clock.c
@@ -3,26 +3,25 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)kern_clock.c        7.2 (Berkeley) %G%
+ *     @(#)kern_clock.c        7.5 (Berkeley) %G%

  */
 
  */
 

-#include "../machine/reg.h"
-#include "../machine/psl.h"
-

 #include "param.h"
 #include "systm.h"
 #include "dkstat.h"
 #include "callout.h"
 #include "param.h"
 #include "systm.h"
 #include "dkstat.h"
 #include "callout.h"

-#include "dir.h"

 #include "user.h"
 #include "kernel.h"
 #include "proc.h"
 #include "vm.h"
 #include "text.h"
 
 #include "user.h"
 #include "kernel.h"
 #include "proc.h"
 #include "vm.h"
 #include "text.h"
 

+#include "machine/reg.h"
+#include "machine/psl.h"
+

 #if defined(vax) || defined(tahoe)
 #if defined(vax) || defined(tahoe)

-#include "../machine/mtpr.h"
-#include "../machine/clock.h"
+#include "machine/mtpr.h"
+#include "machine/clock.h"

 #endif
 
 #ifdef GPROF
 #endif
 
 #ifdef GPROF


@@ -444,12 +443,3 @@ profil()
        upp->pr_off = uap->pcoffset;
        upp->pr_scale = uap->pcscale;
 }
        upp->pr_off = uap->pcoffset;
        upp->pr_scale = uap->pcscale;
 }

-
-#ifdef COMPAT
-opause()
-{
-
-       for (;;)
-               sleep((caddr_t)&u, PSLEP);
-}
-#endif