D9242.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D9242.id.diff
View Options

	Index: head/lib/libc/x86/sys/Makefile.inc
	===================================================================
	--- head/lib/libc/x86/sys/Makefile.inc
	+++ head/lib/libc/x86/sys/Makefile.inc
	@@ -4,3 +4,7 @@

	SRCS+= \
	__vdso_gettc.c
	+
	+.if ${MK_HYPERV} != "no"
	+CFLAGS+= -DWANT_HYPERV
	+.endif
	Index: head/lib/libc/x86/sys/__vdso_gettc.c
	===================================================================
	--- head/lib/libc/x86/sys/__vdso_gettc.c
	+++ head/lib/libc/x86/sys/__vdso_gettc.c
	@@ -46,7 +46,7 @@
	#include <machine/cpufunc.h>
	#include <machine/specialreg.h>
	#include <dev/acpica/acpi_hpet.h>
	-#ifdef __amd64__
	+#ifdef WANT_HYPERV
	#include <dev/hyperv/hyperv.h>
	#endif
	#include "libc_private.h"
	@@ -158,7 +158,7 @@
	munmap((void *)new_map, PAGE_SIZE);
	}

	-#ifdef __amd64__
	+#ifdef WANT_HYPERV

	#define HYPERV_REFTSC_DEVPATH "/dev/" HYPERV_REFTSC_DEVNAME

	@@ -217,7 +217,7 @@
	return (ENOSYS);
	}

	-#endif /* __amd64__ */
	+#endif /* WANT_HYPERV */

	#pragma weak __vdso_gettc
	int
	@@ -246,7 +246,7 @@
	return (ENOSYS);
	tc = (volatile uint32_t *)(map + HPET_MAIN_COUNTER);
	return (0);
	-#ifdef __amd64__
	+#ifdef WANT_HYPERV
	case VDSO_TH_ALGO_X86_HVTSC:
	if (hyperv_ref_tsc == NULL)
	__vdso_init_hyperv_tsc();