Print this page
8956 Implement KPTI
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
*** 21,31 ****
#
# Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Copyright (c) 2010, Intel Corporation.
! # Copyright 2017 Joyent, Inc.
#
# This Makefile defines file modules in the directory uts/i86pc
# and its children. These are the source files which are i86pc
# "implementation architecture" dependent.
#
--- 21,31 ----
#
# Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Copyright (c) 2010, Intel Corporation.
! # Copyright 2018 Joyent, Inc.
#
# This Makefile defines file modules in the directory uts/i86pc
# and its children. These are the source files which are i86pc
# "implementation architecture" dependent.
#
*** 73,83 ****
i86_mmu.o \
ibft.o \
instr_size.o \
intr.o \
kboot_mmu.o \
- kdi_subr.o \
kdi_idt.o \
kdi_idthdl.o \
kdi_asm.o \
lgrpplat.o \
mach_kdi.o \
--- 73,82 ----
*** 156,166 ****
SPECIAL_OBJS_64 += \
locore.o \
fast_trap_asm.o \
interrupt.o \
! syscall_asm_amd64.o
SPECIAL_OBJS += $(SPECIAL_OBJS_$(CLASS))
#
# Objects that get compiled into the identity mapped PT_LOAD section of unix
--- 155,166 ----
SPECIAL_OBJS_64 += \
locore.o \
fast_trap_asm.o \
interrupt.o \
! syscall_asm_amd64.o \
! kpti_trampolines.o
SPECIAL_OBJS += $(SPECIAL_OBJS_$(CLASS))
#
# Objects that get compiled into the identity mapped PT_LOAD section of unix
*** 265,276 ****
mpcore.o \
sseblk.o \
swtch.o \
syscall_asm.o \
syscall_asm_amd64.o \
cpr_wakecode.o
CPR_IMPL_OBJS = cpr_impl.o cpr_wakecode.o
$(KDI_ASSYM_DEPS:%=$(OBJS_DIR)/%): $(DSF_DIR)/$(OBJS_DIR)/kdi_assym.h
-
- ASSYM_DEPS += kdi_asm.o
--- 265,275 ----
mpcore.o \
sseblk.o \
swtch.o \
syscall_asm.o \
syscall_asm_amd64.o \
+ kpti_trampolines.o \
cpr_wakecode.o
CPR_IMPL_OBJS = cpr_impl.o cpr_wakecode.o
$(KDI_ASSYM_DEPS:%=$(OBJS_DIR)/%): $(DSF_DIR)/$(OBJS_DIR)/kdi_assym.h