summaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
Diffstat (limited to 'usr')
-rw-r--r--usr/src/uts/i86pc/io/vmm/sys/vmm_kernel.h4
-rw-r--r--usr/src/uts/i86pc/sys/vmm_dev.h1
-rw-r--r--usr/src/uts/i86pc/vmm/Makefile3
3 files changed, 5 insertions, 3 deletions
diff --git a/usr/src/uts/i86pc/io/vmm/sys/vmm_kernel.h b/usr/src/uts/i86pc/io/vmm/sys/vmm_kernel.h
index 9501850dfc..79b6a54015 100644
--- a/usr/src/uts/i86pc/io/vmm/sys/vmm_kernel.h
+++ b/usr/src/uts/i86pc/io/vmm/sys/vmm_kernel.h
@@ -204,6 +204,10 @@ int vm_service_mmio_write(struct vm *vm, int cpuid, uint64_t gpa, uint64_t wval,
int wsize);
void vm_req_spinup_ap(struct vm *vm, int req_vcpuid, uint64_t req_rip);
+#ifndef __FreeBSD__
+int vm_arc_resv(struct vm *vm, size_t);
+#endif
+
#ifdef _SYS__CPUSET_H_
cpuset_t vm_active_cpus(struct vm *vm);
cpuset_t vm_debug_cpus(struct vm *vm);
diff --git a/usr/src/uts/i86pc/sys/vmm_dev.h b/usr/src/uts/i86pc/sys/vmm_dev.h
index 648f805253..9ebd8eb384 100644
--- a/usr/src/uts/i86pc/sys/vmm_dev.h
+++ b/usr/src/uts/i86pc/sys/vmm_dev.h
@@ -342,6 +342,7 @@ _Static_assert(sizeof(struct vm_readwrite_kernemu_device) == 24, "ABI");
#define VM_SUSPEND_CPU (VMM_IOC_BASE | 0x1d)
#define VM_RESUME_CPU (VMM_IOC_BASE | 0x1e)
+#define VM_ARC_RESV (VMM_IOC_BASE | 0xfe)
#define VM_DEVMEM_GETOFFSET (VMM_IOC_BASE | 0xff)
diff --git a/usr/src/uts/i86pc/vmm/Makefile b/usr/src/uts/i86pc/vmm/Makefile
index 0aa41a8cda..8d833b9dd9 100644
--- a/usr/src/uts/i86pc/vmm/Makefile
+++ b/usr/src/uts/i86pc/vmm/Makefile
@@ -43,9 +43,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
# Overrides and additions
#
-=======
-CERRWARN += -_gcc=-Wno-empty-body
-
# 3rd party code
SMOFF += all_func_returns