xnu-4570.51.1.tar.gz

[apple/xnu.git] / bsd / kern / kern_clock.c

diff --git a/bsd/kern/kern_clock.c b/bsd/kern/kern_clock.c
index f0e0513450156cef708d788a2e047cfd733fad84..08507cdc593e6c330f3b97ea0f95959cea5dbe97 100644 (file)
--- a/bsd/kern/kern_clock.c
+++ b/bsd/kern/kern_clock.c
@@ -69,8 +69,6 @@
  * HISTORY
  */
 
  * HISTORY
  */
 

-#include <machine/spl.h>
-

 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>


@@ -167,6 +165,8 @@ timeout_with_leeway(
 
 /*
  * Cancel a timeout.
 
 /*
  * Cancel a timeout.

+ * Deprecated because it's very inefficient.
+ * Switch to an allocated thread call instead.

  */
 void
 untimeout(
  */
 void
 untimeout(


@@ -201,6 +201,8 @@ bsd_timeout(
 
 /*
  * Cancel a timeout.
 
 /*
  * Cancel a timeout.

+ * Deprecated because it's very inefficient.
+ * Switch to an allocated thread call instead.

  */
 void
 bsd_untimeout(
  */
 void
 bsd_untimeout(


@@ -253,15 +255,14 @@ static int
 sysctl_clockrate
 (__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, __unused struct sysctl_req *req)
 {
 sysctl_clockrate
 (__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, __unused struct sysctl_req *req)
 {

-       struct clockinfo clkinfo;
+       struct clockinfo clkinfo = {
+               .hz         = hz,
+               .tick       = tick,
+               .tickadj    = 0,
+               .stathz     = hz,
+               .profhz     = hz,
+       };

 
 

-       /*
-        * Construct clockinfo structure.
-        */
-       clkinfo.hz = hz;
-       clkinfo.tick = tick;
-       clkinfo.profhz = hz;
-       clkinfo.stathz = hz;

        return sysctl_io_opaque(req, &clkinfo, sizeof(clkinfo), NULL);
 }
 
        return sysctl_io_opaque(req, &clkinfo, sizeof(clkinfo), NULL);
 }