Revert "OS-8005 bhyve memory pressure needs to target ARC better (#354)"
This reverts commit a6033573eedd94118d2b9e65f45deca0bf4b42f7.

          --- old/usr/src/uts/i86pc/vmm/Makefile
          +++ new/usr/src/uts/i86pc/vmm/Makefile

   1    1  #
   2    2  # This file and its contents are supplied under the terms of the
   3    3  # Common Development and Distribution License ("CDDL"), version 1.0.

   4    4  # You may only use this file in accordance with the terms of version
   5    5  # 1.0 of the CDDL.
   6    6  #
   7    7  # A full copy of the text of the CDDL should have accompanied this
   8    8  # source.  A copy of the CDDL is also available via the Internet at
   9    9  # http://www.illumos.org/license/CDDL.
  10   10  #
  11   11  
  12   12  #
  13   13  # Copyright 2013 Pluribus Networks Inc.
  14      -# Copyright 2020 Joyent, Inc.
       14 +# Copyright 2019 Joyent, Inc.
  15   15  #
  16   16  
  17   17  #
  18   18  #       Path to the base of the uts directory tree (usually /usr/src/uts).
  19   19  #
  20   20  UTSBASE = ../..
  21   21  
  22   22  #
  23   23  #       Define the module and object file sets.
  24   24  #

  25   25  MODULE          = vmm
  26   26  OBJECTS         = $(VMM_OBJS:%=$(OBJS_DIR)/%)
  27   27  ROOTMODULE      = $(USR_DRV_DIR)/$(MODULE)
  28   28  CONF_SRCDIR     = $(UTSBASE)/i86pc/io/vmm
  29   29  MAPFILE         = $(UTSBASE)/i86pc/io/vmm/vmm.mapfile
  30   30  
  31   31  #
  32   32  #       Include common rules.
  33   33  #
  34   34  include $(UTSBASE)/i86pc/Makefile.i86pc
  35   35  

  36   36  #
  37   37  #       Define targets
  38   38  #
  39   39  ALL_TARGET      = $(BINARY)
  40   40  INSTALL_TARGET  = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
  41   41  
  42   42  #
  43   43  #       Overrides and additions
  44   44  #
  45   45  
       46 +
  46   47  # 3rd party code
  47   48  SMOFF += all_func_returns
  48   49  
  49   50  # needs work
  50   51  $(OBJS_DIR)/vmm_sol_dev.o := SMOFF += signed_integer_overflow_check
  51   52  
  52   53  ALL_BUILDS      = $(ALL_BUILDSONLY64)
  53   54  DEF_BUILDS      = $(DEF_BUILDSONLY64)
  54   55  PRE_INC_PATH    = -I$(COMPAT)/bhyve -I$(COMPAT)/bhyve/amd64 \
  55   56          -I$(CONTRIB)/bhyve -I$(CONTRIB)/bhyve/amd64
  56   57  INC_PATH        += -I$(UTSBASE)/i86pc/io/vmm -I$(UTSBASE)/i86pc/io/vmm/io
  57   58  AS_INC_PATH     += -I$(UTSBASE)/i86pc/io/vmm -I$(OBJS_DIR)
  58   59  
  59   60  # enable collection of VMM statistics
  60   61  CFLAGS          += -DVMM_KEEP_STATS
  61   62  
  62      -LDFLAGS         += -N misc/acpica -N misc/pcie -N fs/dev -N fs/zfs
       63 +LDFLAGS         += -N misc/acpica -N misc/pcie -N fs/dev
  63   64  LDFLAGS         += -z type=kmod -M $(MAPFILE)
  64   65  
  65   66  OFFSETS_VMX     = $(CONF_SRCDIR)/intel/offsets.in
  66   67  OFFSETS_SVM     = $(CONF_SRCDIR)/amd/offsets.in
  67   68  ASSYM_VMX       = $(OBJS_DIR)/vmx_assym.h
  68   69  ASSYM_SVM       = $(OBJS_DIR)/svm_assym.h
  69   70  ASSYM_H         = $(ASSYM_VMX) $(ASSYM_SVM)
  70   71  
  71   72  CLEANFILES      += $(ASSYM_H)
  72   73  

  73   74  #
  74   75  #       Default build targets.
  75   76  #
  76   77  .KEEP_STATE:
  77   78  
  78   79  def:            $(DEF_DEPS)
  79   80  
  80   81  all:            $(ALL_DEPS)
  81   82  
  82   83  clean:          $(CLEAN_DEPS)
  83   84  
  84   85  clobber:        $(CLOBBER_DEPS)
  85   86  
  86   87  install:        $(INSTALL_DEPS)
  87   88  
  88   89  #
  89   90  #       Include common targets.
  90   91  #
  91   92  include $(UTSBASE)/i86pc/Makefile.targ
  92   93  
  93   94  $(ASSYM_VMX): $(OFFSETS_VMX) $(GENASSYM)
  94   95          $(OFFSETS_CREATE) -I../../i86pc/io/vmm < $(OFFSETS_VMX) >$@
  95   96  $(ASSYM_SVM): $(OFFSETS_SVM) $(GENASSYM)
  96   97          $(OFFSETS_CREATE) -I../../i86pc/io/vmm < $(OFFSETS_SVM) >$@
  97   98  
  98   99  $(OBJS_DIR)/vmx_support.o:  $(ASSYM_VMX)
  99  100  $(OBJS_DIR)/svm_support.o:  $(ASSYM_SVM)

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX