Print this page
8956 Implement KPTI
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/i86pc/Makefile.files
          +++ new/usr/src/uts/i86pc/Makefile.files
↓ open down ↓ 15 lines elided ↑ open up ↑
  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  #
  23   23  # Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
  24   24  #
  25   25  # Copyright (c) 2010, Intel Corporation.
  26      -# Copyright 2017 Joyent, Inc.
       26 +# Copyright 2018 Joyent, Inc.
  27   27  #
  28   28  #       This Makefile defines file modules in the directory uts/i86pc
  29   29  #       and its children. These are the source files which are i86pc
  30   30  #       "implementation architecture" dependent.
  31   31  #
  32   32  
  33   33  #
  34   34  #       object lists
  35   35  #
  36   36  CORE_OBJS +=                    \
↓ open down ↓ 31 lines elided ↑ open up ↑
  68   68          hold_page.o             \
  69   69          hrtimers.o              \
  70   70          htable.o                \
  71   71          hypercall.o             \
  72   72          hypersubr.o             \
  73   73          i86_mmu.o               \
  74   74          ibft.o                  \
  75   75          instr_size.o            \
  76   76          intr.o                  \
  77   77          kboot_mmu.o             \
  78      -        kdi_subr.o              \
  79   78          kdi_idt.o               \
  80   79          kdi_idthdl.o            \
  81   80          kdi_asm.o               \
  82   81          lgrpplat.o              \
  83   82          mach_kdi.o              \
  84   83          mach_sysconfig.o        \
  85   84          machdep.o               \
  86   85          mem_config.o            \
  87   86          mem_config_stubs.o      \
  88   87          mem_config_arch.o       \
↓ open down ↓ 62 lines elided ↑ open up ↑
 151  150  SPECIAL_OBJS_32 +=              \
 152  151          locore.o                \
 153  152          fast_trap_asm.o         \
 154  153          interrupt.o             \
 155  154          syscall_asm.o
 156  155  
 157  156  SPECIAL_OBJS_64 +=              \
 158  157          locore.o                \
 159  158          fast_trap_asm.o         \
 160  159          interrupt.o             \
 161      -        syscall_asm_amd64.o
      160 +        syscall_asm_amd64.o     \
      161 +        kpti_trampolines.o
 162  162  
 163  163  SPECIAL_OBJS += $(SPECIAL_OBJS_$(CLASS))
 164  164  
 165  165  #
 166  166  # Objects that get compiled into the identity mapped PT_LOAD section of unix
 167  167  # to handle the earliest part of booting.
 168  168  #
 169  169  DBOOT_OBJS_32 =
 170  170  
 171  171  DBOOT_OBJS_64 += dboot_elfload.o
↓ open down ↓ 88 lines elided ↑ open up ↑
 260  260          float.o                 \
 261  261          i86_subr.o              \
 262  262          interrupt.o             \
 263  263          lock_prim.o             \
 264  264          locore.o                \
 265  265          mpcore.o                \
 266  266          sseblk.o                \
 267  267          swtch.o                 \
 268  268          syscall_asm.o           \
 269  269          syscall_asm_amd64.o     \
      270 +        kpti_trampolines.o      \
 270  271          cpr_wakecode.o
 271  272  
 272  273  CPR_IMPL_OBJS   = cpr_impl.o    cpr_wakecode.o
 273  274  
 274  275  $(KDI_ASSYM_DEPS:%=$(OBJS_DIR)/%):      $(DSF_DIR)/$(OBJS_DIR)/kdi_assym.h
 275      -
 276      -ASSYM_DEPS += kdi_asm.o
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX