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

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/intel/zfs/Makefile
          +++ new/usr/src/uts/intel/zfs/Makefile
↓ open down ↓ 21 lines elided ↑ open up ↑
  22   22  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
  25   25  #       This makefile drives the production of the zfs file system
  26   26  #       kernel module.
  27   27  #
  28   28  # Copyright 2013 Saso Kiselkov. All rights reserved.
  29   29  #
  30   30  # Copyright (c) 2016 by Delphix. All rights reserved.
  31   31  #
  32      -# Copyright (c) 2018, Joyent, Inc.
       32 +# Copyright 2018 Joyent, Inc.
  33   33  
  34   34  #
  35   35  #       Path to the base of the uts directory tree (usually /usr/src/uts).
  36   36  #
  37   37  UTSBASE = ../..
  38   38  
  39   39  ARCHDIR:sh = cd ..; basename `pwd`
  40   40  
  41   41  #
  42   42  #       Define the module and object file sets.
↓ open down ↓ 23 lines elided ↑ open up ↑
  66   66  #
  67   67  MODSTUBS_DIR     = $(OBJS_DIR)
  68   68  LDFLAGS         += -dy -Nfs/specfs -Ncrypto/swrand -Nmisc/idmap -Nmisc/sha2 \
  69   69          -Nmisc/skein -Nmisc/edonr
  70   70  
  71   71  INC_PATH        += -I$(UTSBASE)/common/fs/zfs
  72   72  INC_PATH        += -I$(UTSBASE)/common/fs/zfs/lua
  73   73  INC_PATH        += -I$(SRC)/common
  74   74  INC_PATH        += -I$(COMMONBASE)/zfs
  75   75  
       76 +CPPFLAGS        += -I$(UTSBASE)/i86pc
  76   77  C99LMODE=       -Xc99=%all
  77   78  
  78   79  #
  79   80  # For now, disable these lint checks; maintainers should endeavor
  80   81  # to investigate and remove these for maximum lint coverage.
  81   82  # Please do not carry these forward to new Makefiles.
  82   83  #
  83   84  LINTTAGS        += -erroff=E_SUSPICIOUS_COMPARISON
  84   85  LINTTAGS        += -erroff=E_BAD_PTR_CAST_ALIGN
  85   86  LINTTAGS        += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
↓ open down ↓ 51 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX