Print this page
Revert "OS-8005 bhyve memory pressure needs to target ARC better (#354)"
This reverts commit a6033573eedd94118d2b9e65f45deca0bf4b42f7.
*** 9,19 ****
# http://www.illumos.org/license/CDDL.
#
#
# Copyright 2013 Pluribus Networks Inc.
! # Copyright 2020 Joyent, Inc.
#
#
# Path to the base of the uts directory tree (usually /usr/src/uts).
#
--- 9,19 ----
# http://www.illumos.org/license/CDDL.
#
#
# Copyright 2013 Pluribus Networks Inc.
! # Copyright 2019 Joyent, Inc.
#
#
# Path to the base of the uts directory tree (usually /usr/src/uts).
#
*** 41,50 ****
--- 41,51 ----
#
# Overrides and additions
#
+
# 3rd party code
SMOFF += all_func_returns
# needs work
$(OBJS_DIR)/vmm_sol_dev.o := SMOFF += signed_integer_overflow_check
*** 57,67 ****
AS_INC_PATH += -I$(UTSBASE)/i86pc/io/vmm -I$(OBJS_DIR)
# enable collection of VMM statistics
CFLAGS += -DVMM_KEEP_STATS
! LDFLAGS += -N misc/acpica -N misc/pcie -N fs/dev -N fs/zfs
LDFLAGS += -z type=kmod -M $(MAPFILE)
OFFSETS_VMX = $(CONF_SRCDIR)/intel/offsets.in
OFFSETS_SVM = $(CONF_SRCDIR)/amd/offsets.in
ASSYM_VMX = $(OBJS_DIR)/vmx_assym.h
--- 58,68 ----
AS_INC_PATH += -I$(UTSBASE)/i86pc/io/vmm -I$(OBJS_DIR)
# enable collection of VMM statistics
CFLAGS += -DVMM_KEEP_STATS
! LDFLAGS += -N misc/acpica -N misc/pcie -N fs/dev
LDFLAGS += -z type=kmod -M $(MAPFILE)
OFFSETS_VMX = $(CONF_SRCDIR)/intel/offsets.in
OFFSETS_SVM = $(CONF_SRCDIR)/amd/offsets.in
ASSYM_VMX = $(OBJS_DIR)/vmx_assym.h