summaryrefslogtreecommitdiffstats
path: root/sys/i386/isa/clock.c
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1998-01-28 10:41:33 +0000
committerphk <phk@FreeBSD.org>1998-01-28 10:41:33 +0000
commit1dcb350c35b96c0e5d23838fb75bef28c5695ef4 (patch)
tree62d22d44de25edcbcbd1b9320603c7f371f0c618 /sys/i386/isa/clock.c
parent4767f5d9cff20259ec10d068b75bf6ed14796404 (diff)
downloadFreeBSD-src-1dcb350c35b96c0e5d23838fb75bef28c5695ef4.zip
FreeBSD-src-1dcb350c35b96c0e5d23838fb75bef28c5695ef4.tar.gz
APM calls inittodr(0) which is stupid, but at least stop setting the
clock back to when Dennis had a good idea.
Diffstat (limited to 'sys/i386/isa/clock.c')
-rw-r--r--sys/i386/isa/clock.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index 15a874c..da85b08 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.106 1997/12/28 13:36:07 phk Exp $
+ * $Id: clock.c,v 1.107 1997/12/28 17:33:10 phk Exp $
*/
/*
@@ -730,10 +730,12 @@ inittodr(time_t base)
int year, month;
int y, m, s;
- s = splclock();
- time.tv_sec = base;
- time.tv_usec = 0;
- splx(s);
+ if (base) {
+ s = splclock();
+ time.tv_sec = base;
+ time.tv_usec = 0;
+ splx(s);
+ }
/* Look if we have a RTC present and the time is valid */
if (!(rtcin(RTC_STATUSD) & RTCSD_PWR))
OpenPOWER on IntegriCloud