summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-08-12 15:03:09 -0300
committerRenato Botelho <renato@netgate.com>2016-08-12 15:03:09 -0300
commit529a654ae2c9fb892722782dd056e36119dfac5a (patch)
treea68c2aa712fc83e78b0e5f2f26c0e1c2a91078dd /sys
parent12d11ed6c92d2a1a66cbe53f83c0423602609f40 (diff)
downloadFreeBSD-src-529a654ae2c9fb892722782dd056e36119dfac5a.zip
FreeBSD-src-529a654ae2c9fb892722782dd056e36119dfac5a.tar.gz
Revert "Import patch from FreeBSD D5778 to fix "runtime went backwards" in Hyper-V. Ticket #6446"
This reverts commit 95be4fb0378e88b4a64a2da93e8ef4611475a916.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/hyperv/vmbus/hv_hv.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/sys/dev/hyperv/vmbus/hv_hv.c b/sys/dev/hyperv/vmbus/hv_hv.c
index 5589895..ca5641f 100644
--- a/sys/dev/hyperv/vmbus/hv_hv.c
+++ b/sys/dev/hyperv/vmbus/hv_hv.c
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <sys/pcpu.h>
#include <sys/timetc.h>
-#include <sys/kernel.h>
#include <machine/bus.h>
#include <machine/md_var.h>
#include <vm/vm.h>
@@ -212,6 +211,8 @@ hv_vmbus_init(void)
hv_vmbus_g_context.hypercall_page = virt_addr;
+ tc_init(&hv_timecounter); /* register virtual timecount */
+
hv_et_init();
return (0);
@@ -426,14 +427,3 @@ void hv_vmbus_synic_cleanup(void *arg)
wrmsr(HV_X64_MSR_SIEFP, siefp.as_uint64_t);
}
-static void
-hv_tc_init(void)
-{
- if (vm_guest != VM_GUEST_HV)
- return;
-
- /* register virtual timecounter */
- tc_init(&hv_timecounter);
-}
-
-SYSINIT(hv_tc_init, SI_SUB_HYPERVISOR, SI_ORDER_FIRST, hv_tc_init, NULL);
OpenPOWER on IntegriCloud