summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2006-10-02 12:59:59 +0000
committerphk <phk@FreeBSD.org>2006-10-02 12:59:59 +0000
commit50c81b8a9a184590a45c87eace5798a2055cee48 (patch)
treef5002a864a5082d410445f24b5d28a04581034f1 /sys/amd64
parenta74a69e33655413d8141ad4e5faff9237ef517c1 (diff)
downloadFreeBSD-src-50c81b8a9a184590a45c87eace5798a2055cee48.zip
FreeBSD-src-50c81b8a9a184590a45c87eace5798a2055cee48.tar.gz
First part of a little cleanup in the calendar/timezone/RTC handling.
Move relevant variables to <sys/clock.h> and fix #includes as necessary. Use libkern's much more time- & spamce-efficient BCD routines.
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/amd64/machdep.c1
-rw-r--r--sys/amd64/include/clock.h3
-rw-r--r--sys/amd64/isa/clock.c1
-rw-r--r--sys/amd64/linux32/linux32_machdep.c1
4 files changed, 3 insertions, 3 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 544b9fb..1316186 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$");
#include <sys/buf.h>
#include <sys/bus.h>
#include <sys/callout.h>
+#include <sys/clock.h>
#include <sys/cons.h>
#include <sys/cpu.h>
#include <sys/eventhandler.h>
diff --git a/sys/amd64/include/clock.h b/sys/amd64/include/clock.h
index f091b17..36d0beb 100644
--- a/sys/amd64/include/clock.h
+++ b/sys/amd64/include/clock.h
@@ -14,9 +14,7 @@
* i386 to clock driver interface.
* XXX large parts of the driver and its interface are misplaced.
*/
-extern int adjkerntz;
extern int clkintr_pending;
-extern int disable_rtc_set;
extern int pscnt;
extern int psdiv;
extern int statclock_disable;
@@ -24,7 +22,6 @@ extern u_int timer_freq;
extern int timer0_max_count;
extern uint64_t tsc_freq;
extern int tsc_is_broken;
-extern int wall_cmos_clock;
extern struct mtx clock_lock;
/*
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c
index 28116dc..8108281 100644
--- a/sys/amd64/isa/clock.c
+++ b/sys/amd64/isa/clock.c
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
+#include <sys/clock.h>
#include <sys/lock.h>
#include <sys/kdb.h>
#include <sys/mutex.h>
diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c
index a553602..42f413d 100644
--- a/sys/amd64/linux32/linux32_machdep.c
+++ b/sys/amd64/linux32/linux32_machdep.c
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
+#include <sys/clock.h>
#include <sys/imgact.h>
#include <sys/limits.h>
#include <sys/lock.h>
OpenPOWER on IntegriCloud