From owner-svn-src-stable@freebsd.org  Mon Jul 13 11:59:30 2015
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4B51C99BB7C;
 Mon, 13 Jul 2015 11:59:30 +0000 (UTC)
 (envelope-from brueffer@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 23BCCE42;
 Mon, 13 Jul 2015 11:59:30 +0000 (UTC)
 (envelope-from brueffer@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6DBxTQJ075220;
 Mon, 13 Jul 2015 11:59:29 GMT (envelope-from brueffer@FreeBSD.org)
Received: (from brueffer@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6DBxTf6075218;
 Mon, 13 Jul 2015 11:59:29 GMT (envelope-from brueffer@FreeBSD.org)
Message-Id: <201507131159.t6DBxTf6075218@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brueffer set sender to
 brueffer@FreeBSD.org using -f
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Mon, 13 Jul 2015 11:59:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r285447 - stable/9/sys/x86/isa
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jul 2015 11:59:30 -0000

Author: brueffer
Date: Mon Jul 13 11:59:28 2015
New Revision: 285447
URL: https://svnweb.freebsd.org/changeset/base/285447

Log:
  MFC: r284931
  
  Set the initial system time to a sane (as in: not end of 21st century)
  value when booting on a PC with CMOS clock set to a year before 2000.
  
  This uses 1980 (instead of 1970 as in the initial patch) as pivot year as
  suggested by imp in the PR followup.
  
  PR:		195703
  Submitted by:	cs@soi.spb.ru
  Reviewed by:	imp

Modified:
  stable/9/sys/x86/isa/atrtc.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/x86/isa/atrtc.c
==============================================================================
--- stable/9/sys/x86/isa/atrtc.c	Mon Jul 13 11:58:08 2015	(r285446)
+++ stable/9/sys/x86/isa/atrtc.c	Mon Jul 13 11:59:28 2015	(r285447)
@@ -354,7 +354,7 @@ atrtc_gettime(device_t dev, struct times
 #ifdef USE_RTC_CENTURY
 	ct.year += readrtc(RTC_CENTURY) * 100;
 #else
-	ct.year += 2000;
+	ct.year += (ct.year < 80 ? 2000 : 1900);
 #endif
 	/* Set dow = -1 because some clocks don't set it correctly. */
 	ct.dow = -1;