From b8d1a376380ecf401d563dc7fb221b3be89857b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Date: Thu, 9 Jun 2016 16:15:01 +0000 Subject: [PATCH] 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 Sponsored by: Citrix Systems R&D --- sys/dev/xen/timer/timer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/xen/timer/timer.c b/sys/dev/xen/timer/timer.c index 996399bd52f7..0b26847b399d 100644 --- a/sys/dev/xen/timer/timer.c +++ b/sys/dev/xen/timer/timer.c @@ -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);