diff options
author | Renato Botelho <renato@netgate.com> | 2016-09-23 13:44:36 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-09-23 13:44:36 -0300 |
commit | 5a5f882809260c3079797ed53b1a007ca40a0924 (patch) | |
tree | e650d06483dd11752e316e0f45d1d6677bb973d2 | |
parent | 7307492dde2abb993381ae1d139aa23199919593 (diff) | |
download | FreeBSD-src-5a5f882809260c3079797ed53b1a007ca40a0924.zip FreeBSD-src-5a5f882809260c3079797ed53b1a007ca40a0924.tar.gz |
Revert "Import patch from FreeBSD D5778 to fix "runtime went backwards" in Hyper-V. Ticket #6446"
This reverts commit 95be4fb0378e88b4a64a2da93e8ef4611475a916.
-rw-r--r-- | sys/dev/hyperv/vmbus/hv_hv.c | 14 |
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); |