D33893.1785666176.diff
No OneTemporary
Actions

Size

722 B

Referenced Files

None

Subscribers

None

D33893.1785666176.diff
View Options

	Index: sys/x86/x86/tsc.c
	===================================================================
	--- sys/x86/x86/tsc.c
	+++ sys/x86/x86/tsc.c
	@@ -134,7 +134,6 @@
	if (regs[1] != UINT_MAX)
	tsc_freq = regs[0] \| ((uint64_t)regs[1] << 32);
	}
	- tsc_is_invariant = 1;
	tsc_early_calib_exact = 1;
	}

	@@ -268,11 +267,6 @@
	tsc_perf_stat = 1;
	}

	- if (vm_guest == VM_GUEST_VMWARE) {
	- tsc_freq_vmware();
	- return;
	- }
	-
	switch (cpu_vendor_id) {
	case CPU_VENDOR_AMD:
	case CPU_VENDOR_HYGON:
	@@ -311,6 +305,11 @@
	break;
	}

	+ if (vm_guest == VM_GUEST_VMWARE) {
	+ tsc_freq_vmware();
	+ return;
	+ }
	+
	if (tsc_freq_cpuid(&tsc_freq)) {
	/*
	* If possible, use the value obtained from CPUID as the initial