OS-7125 Need mitigation of L1TF (CVE-2018-3646)
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>

          --- old/usr/src/uts/sun4v/sys/Makefile
          +++ new/usr/src/uts/sun4v/sys/Makefile

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.

  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  
  22   22  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
       25 +# Copyright 2018 Joyent, Inc.
  25   26  #
  26      -# uts/sun4v/sys/Makefile
  27      -#
  28   27  # include global definitions
  29   28  UTSBASE = ../..
  30   29  
  31   30  #
  32   31  # include global definitions
  33   32  #
  34   33  include ../Makefile.sun4v
  35   34  
  36   35  #
  37   36  # Override defaults.
  38   37  #
  39   38  FILEMODE         = 644
  40   39  
  41   40  SUN4_HDRS=                      \
  42   41          clock.h                 \
  43   42          cmp.h                   \
  44   43          cpc_ultra.h             \
  45      -        cpu_sgnblk_defs.h       \
       44 +        cpu_sgnblk_defs.h       \
  46   45          ddi_subrdefs.h          \
  47   46          dvma.h                  \
  48   47          eeprom.h                \
  49   48          fcode.h                 \
       49 +        ht.h                    \
  50   50          idprom.h                \
  51   51          intr.h                  \
  52   52          intreg.h                \
  53   53          ivintr.h                \
  54      -        memlist_plat.h          \
       54 +        memlist_plat.h          \
  55   55          memnode.h               \
  56   56          nexusdebug.h            \
  57   57          prom_debug.h            \
  58   58          scb.h                   \
  59   59          sun4asi.h               \
  60   60          tod.h                   \
  61   61          trapstat.h              \
  62   62          vis.h                   \
  63   63          vm_machparam.h          \
  64   64          x_call.h                \

  65   65          xc_impl.h               \
  66   66          zsmach.h
  67   67  
  68   68  HDRS=   \
  69   69          ds_pri.h                \
  70   70          ds_snmp.h               \
  71   71          hypervisor_api.h        \
  72   72          hsvc.h                  \
  73   73          machasi.h               \
  74   74          machclock.h             \
  75   75          machcpuvar.h            \
  76   76          mach_descrip.h          \
  77   77          machintreg.h            \
  78   78          machparam.h             \
  79   79          machsystm.h             \
  80   80          machthread.h            \
  81   81          mmu.h                   \
  82   82          niagaraasi.h            \
  83   83          niagararegs.h           \
  84   84          ntwdt.h                 \
  85   85          pte.h                   \
  86   86          prom_plat.h             \
  87   87          qcn.h                   \
  88   88          soft_state.h            \
  89   89          traptrace.h             \
  90   90          vlds.h
  91   91  
  92   92  ROOTHDRS=               $(HDRS:%=$(USR_PSM_ISYS_DIR)/%)
  93   93  
  94   94  SUN4_ROOTHDRS=          $(SUN4_HDRS:%=$(USR_PSM_ISYS_DIR)/%)
  95   95  
  96   96  ROOTDIR=                $(ROOT)/usr/share/src
  97   97  ROOTDIRS=               $(ROOTDIR)/uts $(ROOTDIR)/uts/$(PLATFORM)
  98   98  
  99   99  ROOTLINK=               $(ROOTDIR)/uts/$(PLATFORM)/sys
 100  100  LINKDEST=               ../../../../platform/$(PLATFORM)/include/sys
 101  101  
 102  102  CHECKHDRS=              $(HDRS:%.h=%.check) \
 103  103                          $(SUN4_HDRS:%.h=%.cmncheck)
 104  104  
 105  105  .KEEP_STATE:
 106  106  
 107  107  .PARALLEL: $(CHECKHDRS) $(ROOTHDRS) $(SUN4_ROOTHDRS)
 108  108  
 109  109  install_h: $(ROOTDIRS) .WAIT \
 110  110                  $(ROOTHDRS) .WAIT \
 111  111                  $(SUN4_ROOTHDRS) .WAIT $(ROOTLINK)
 112  112  
 113  113  check:  $(CHECKHDRS)
 114  114  
 115  115  #
 116  116  # install rules
 117  117  #
 118  118  $(USR_PSM_ISYS_DIR)/%:  ../../sfmmu/sys/% $(USR_PSM_ISYS_DIR)
 119  119          $(INS.file)
 120  120  
 121  121  $(USR_PSM_ISYS_DIR)/%:  ../../sun4/sys/% $(USR_PSM_ISYS_DIR)
 122  122          $(INS.file)
 123  123  
 124  124  $(ROOTDIRS):
 125  125          $(INS.dir)
 126  126  
 127  127  # -r because this used to be a directory and is now a link.
 128  128  $(ROOTLINK):    $(ROOTDIRS)
 129  129          -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@
 130  130  
 131  131  mon/%.check:    mon/%.h
 132  132          $(DOT_H_CHECK)
 133  133  
 134  134  %.check:        ../../sfmmu/sys/%.h
 135  135          $(DOT_H_CHECK)
 136  136  %.cmncheck:     ../../sun4/sys/%.h
 137  137          $(DOT_H_CHECK)
 138  138  
 139  139  FRC:
 140  140  
 141  141  include ../../Makefile.targ

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX