Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 8 Oct 2020 20:56:12 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
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
Message-ID:  <202010082056.098KuCpU057480@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010082056.098KuCpU057480>