summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/amd64/locore.S
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/amd64/amd64/locore.S')
-rw-r--r--sys/arch/amd64/amd64/locore.S12
1 files changed, 11 insertions, 1 deletions
diff --git a/sys/arch/amd64/amd64/locore.S b/sys/arch/amd64/amd64/locore.S
index a147f3dfcd2..52ae39cce42 100644
--- a/sys/arch/amd64/amd64/locore.S
+++ b/sys/arch/amd64/amd64/locore.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.S,v 1.80 2016/06/06 06:02:02 deraadt Exp $ */
+/* $OpenBSD: locore.S,v 1.81 2016/06/22 01:12:38 mikeb Exp $ */
/* $NetBSD: locore.S,v 1.13 2004/03/25 18:33:17 drochner Exp $ */
/*
@@ -110,6 +110,7 @@
#include "ksyms.h"
#include "acpi.h"
#include "xen.h"
+#include "hyperv.h"
#include <sys/errno.h>
#include <sys/syscall.h>
@@ -1195,3 +1196,12 @@ _C_LABEL(codepatch_end):
_C_LABEL(xen_hypercall_page):
.skip 0x1000, 0xcc
#endif /* NXEN > 0 */
+
+#if NHYPERV > 0
+ /* Hypercall page needs to be page aligned */
+ .text
+ .align NBPG, 0xcc
+ .globl _C_LABEL(hv_hypercall_page)
+_C_LABEL(hv_hypercall_page):
+ .skip 0x1000, 0xcc
+#endif /* NXEN > 0 */