tedu some code that has not been executed since time_t became 64 bits

guenther@ deraadt@

1 files changed, 1 insertions, 20 deletions

diff --git a/sys/arch/amd64/isa/clock.c b/sys/arch/amd64/isa/clock.c
index c110ffdd2f8..749d0bcb443 100644
--- a/sys/arch/amd64/isa/clock.c
+++ b/sys/arch/amd64/isa/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.23 2016/08/03 17:33:50 jcs Exp $	*/
+/*	$OpenBSD: clock.c,v 1.24 2017/01/25 08:23:50 tom Exp $	*/
 /*	$NetBSD: clock.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $	*/
 
 /*-
@@ -506,25 +506,6 @@ inittodr(time_t base)
 	dt.dt_mon = bcdtobin(rtclk[MC_MONTH]);
 	dt.dt_year = clock_expandyear(bcdtobin(rtclk[MC_YEAR]));
 
-	/*
-	 * If time_t is 32 bits, then the "End of Time" is
-	 * Mon Jan 18 22:14:07 2038 (US/Eastern)
-	 * This code copes with RTC's past the end of time if time_t
-	 * is an int32 or less. Needed because sometimes RTCs screw
-	 * up or are badly set, and that would cause the time to go
-	 * negative in the calculation below, which causes Very Bad
-	 * Mojo. This at least lets the user boot and fix the problem.
-	 * Note the code is self eliminating once time_t goes to 64 bits.
-	 */
-	if (sizeof(time_t) <= sizeof(int32_t)) {
-		if (dt.dt_year >= 2038) {
-			printf("WARNING: RTC time at or beyond 2038.\n");
-			dt.dt_year = 2037;
-			printf("WARNING: year set back to 2037.\n");
-			printf("WARNING: CHECK AND RESET THE DATE!\n");
-		}
-	}
-
 	ts.tv_sec = clock_ymdhms_to_secs(&dt) + tz.tz_minuteswest * 60;
 	if (tz.tz_dsttime)
 		ts.tv_sec -= 3600;