From 1dcb350c35b96c0e5d23838fb75bef28c5695ef4 Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Wed, 28 Jan 1998 10:41:33 +0000
Subject: [PATCH] APM calls inittodr(0) which is stupid, but at least stop
 setting the clock back to when Dennis had a good idea.

---
 sys/amd64/amd64/tsc.c | 12 +++++++-----
 sys/amd64/isa/clock.c | 12 +++++++-----
 sys/i386/i386/tsc.c   | 12 +++++++-----
 sys/i386/isa/clock.c  | 12 +++++++-----
 sys/isa/atrtc.c       | 12 +++++++-----
 5 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c
index 15a874c76c2..da85b088d67 100644
--- a/sys/amd64/amd64/tsc.c
+++ b/sys/amd64/amd64/tsc.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))
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c
index 15a874c76c2..da85b088d67 100644
--- a/sys/amd64/isa/clock.c
+++ b/sys/amd64/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))
diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c
index 15a874c76c2..da85b088d67 100644
--- a/sys/i386/i386/tsc.c
+++ b/sys/i386/i386/tsc.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))
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index 15a874c76c2..da85b088d67 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))
diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c
index 15a874c76c2..da85b088d67 100644
--- a/sys/isa/atrtc.c
+++ b/sys/isa/atrtc.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))
-- 
2.45.2