diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-05-16 01:51:24 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-05-16 01:51:24 +0000 |
| commit | e7035695d4ab1499c73b7a7fedbcfc325f86cc40 (patch) | |
| tree | d48b3fd1a27dda5b4f956d1fb132933bdc6ac2db /sys/arch/amd64 | |
| parent | 6968d4be376947ee3a06056ed434b9edaff38043 (diff) | |
place .globals further up, to reduce confusion
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/amd64/vmm_support.S | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/arch/amd64/amd64/vmm_support.S b/sys/arch/amd64/amd64/vmm_support.S index 6963c286f01..012b2b5817f 100644 --- a/sys/arch/amd64/amd64/vmm_support.S +++ b/sys/arch/amd64/amd64/vmm_support.S @@ -1,4 +1,4 @@ -/* $OpenBSD: vmm_support.S,v 1.3 2016/03/15 20:50:22 krw Exp $ */ +/* $OpenBSD: vmm_support.S,v 1.4 2016/05/16 01:51:23 deraadt Exp $ */ /* * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org> * @@ -27,9 +27,6 @@ #define VMX_FAIL_LAUNCH_INVALID_VMCS 2 #define VMX_FAIL_LAUNCH_VALID_VMCS 3 - .text - .code64 - .align 16 .global _C_LABEL(vmxon) .global _C_LABEL(vmxoff) .global _C_LABEL(vmclear) @@ -41,6 +38,10 @@ .global _C_LABEL(invept) .global _C_LABEL(vmx_enter_guest) .global _C_LABEL(vmm_dispatch_intr) + + .text + .code64 + .align 16,0xcc _C_LABEL(vmm_dispatch_intr): movq %rsp, %r11 /* r11 = temporary register */ andq $0xFFFFFFFFFFFFFFF0, %rsp |