svn commit: r301742 - head/sys/dev/xen/timer

Roger Pau Monné royger at FreeBSD.org
Thu Jun 9 16:15:02 UTC 2016


Author: royger
Date: Thu Jun  9 16:15:01 2016
New Revision: 301742
URL: https://svnweb.freebsd.org/changeset/base/301742

Log:
  xen/timer: re-introduce the inittodr call in the resume path
  
  r298930 removed the inittodr call, but it seems like this prevents
  "calcru: runtime went backwards ..." messages from occasionally appearing
  when resuming from migration.
  
  Reported by:	Karl Pielorz <kpielorz at tdx.co.uk>
  Sponsored by:	Citrix Systems R&D

Modified:
  head/sys/dev/xen/timer/timer.c

Modified: head/sys/dev/xen/timer/timer.c
==============================================================================
--- head/sys/dev/xen/timer/timer.c	Thu Jun  9 16:05:56 2016	(r301741)
+++ head/sys/dev/xen/timer/timer.c	Thu Jun  9 16:15:01 2016	(r301742)
@@ -477,6 +477,9 @@ xentimer_resume(device_t dev)
 	/* Reset the last uptime value */
 	pvclock_resume();
 
+	/* Reset the RTC clock */
+	inittodr(time_second);
+
 	/* Kick the timers on all CPUs */
 	smp_rendezvous(NULL, xentimer_percpu_resume, NULL, dev);
 


More information about the svn-src-all mailing list