From owner-svn-src-head@freebsd.org Wed Jan 10 17:25:09 2018 Return-Path: Delivered-To: svn-src-head@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 F14A7E6969E; Wed, 10 Jan 2018 17:25:09 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CB63C7FE56; Wed, 10 Jan 2018 17:25:09 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 14EF8986; Wed, 10 Jan 2018 17:25:09 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0AHP8Jh020381; Wed, 10 Jan 2018 17:25:08 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0AHP8Ca020379; Wed, 10 Jan 2018 17:25:08 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201801101725.w0AHP8Ca020379@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 10 Jan 2018 17:25:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r327774 - in head: . sys/i386/bios X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head: . sys/i386/bios X-SVN-Commit-Revision: 327774 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jan 2018 17:25:10 -0000 Author: imp Date: Wed Jan 10 17:25:08 2018 New Revision: 327774 URL: https://svnweb.freebsd.org/changeset/base/327774 Log: inittodr(0) actually sets the time, so there's no need to call tc_setclock(). It's redundant. Tweak UPDATING based on code review of past releases. Relnotes: yes (for the removal of pmtimer) Modified: head/UPDATING head/sys/i386/bios/apm.c Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Jan 10 16:56:02 2018 (r327773) +++ head/UPDATING Wed Jan 10 17:25:08 2018 (r327774) @@ -53,8 +53,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: 20180110: On i386, pmtimer has been removed. It's functionality has been folded - into apm. It was a nop on ACPI. Users may need to remove it from kernel - config files. + into apm. It was a nop on ACPI in current for a while now (but was still + needed on i386 in FreeBSD 11 and earlier). Users may need to remove it + from kernel config files. 20180104: The use of RSS hash from the network card aka flowid has been Modified: head/sys/i386/bios/apm.c ============================================================================== --- head/sys/i386/bios/apm.c Wed Jan 10 16:56:02 2018 (r327773) +++ head/sys/i386/bios/apm.c Wed Jan 10 17:25:08 2018 (r327774) @@ -1086,7 +1086,6 @@ apm_rtc_resume(void *arg __unused) { u_int second, minute, hour; struct timeval resume_time, tmp_time; - struct timespec ts; /* modified for adjkerntz */ timer_restore(); /* restore the all timers */ @@ -1097,14 +1096,11 @@ apm_rtc_resume(void *arg __unused) /* Calculate the delta time suspended */ timevalsub(&resume_time, &suspend_time); - second = ts.tv_sec = resume_time.tv_sec; - ts.tv_nsec = 0; - tc_setclock(&ts); - #ifdef PMTIMER_FIXUP_CALLTODO /* Fixup the calltodo list with the delta time. */ adjust_timeout_calltodo(&resume_time); #endif /* PMTIMER_FIXUP_CALLTODO */ + second = resume_time.tv_sec; hour = second / 3600; second %= 3600; minute = second / 60;