From owner-svn-src-head@freebsd.org Thu Oct 8 20:56:14 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E711E431413; Thu, 8 Oct 2020 20:56:14 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C6k5B2FGsz4TFr; Thu, 8 Oct 2020 20:56:13 +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 75E3DED0E; Thu, 8 Oct 2020 20:56:12 +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 098KuCKJ057481; Thu, 8 Oct 2020 20:56:12 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 098KuCpU057480; Thu, 8 Oct 2020 20:56:12 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202010082056.098KuCpU057480@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Thu, 8 Oct 2020 20:56:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r366547 - in head/sys: i386/include x86/isa X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys: i386/include x86/isa X-SVN-Commit-Revision: 366547 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.33 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: Thu, 08 Oct 2020 20:56:15 -0000 Author: imp Date: Thu Oct 8 20:56:11 2020 New Revision: 366547 URL: https://svnweb.freebsd.org/changeset/base/366547 Log: timer_restore is now unused, remove it apm was the only consumer of timer_restore. Now that it's gone, this can be removed. Modified: head/sys/i386/include/clock.h head/sys/x86/isa/clock.c Modified: head/sys/i386/include/clock.h ============================================================================== --- head/sys/i386/include/clock.h Thu Oct 8 20:56:06 2020 (r366546) +++ head/sys/i386/include/clock.h Thu Oct 8 20:56:11 2020 (r366547) @@ -30,7 +30,6 @@ void clock_init(void); */ void startrtclock(void); -void timer_restore(void); void init_TSC(void); void resume_TSC(void); Modified: head/sys/x86/isa/clock.c ============================================================================== --- head/sys/x86/isa/clock.c Thu Oct 8 20:56:06 2020 (r366546) +++ head/sys/x86/isa/clock.c Thu Oct 8 20:56:11 2020 (r366547) @@ -388,26 +388,6 @@ i8254_restore(void) set_i8254_freq(MODE_STOP, 0); } -#ifndef __amd64__ -/* - * Restore all the timers non-atomically (XXX: should be atomically). - * - * This function is called from pmtimer_resume() to restore all the timers. - * This should not be necessary, but there are broken laptops that do not - * restore all the timers on resume. The APM spec was at best vague on the - * subject. - * pmtimer is used only with the old APM power management, and not with - * acpi, which is required for amd64, so skip it in that case. - */ -void -timer_restore(void) -{ - - i8254_restore(); /* restore i8254_freq and hz */ - atrtc_restore(); /* reenable RTC interrupts */ -} -#endif - /* This is separate from startrtclock() so that it can be called early. */ void i8254_init(void)