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

@@ -19,11 +19,11 @@
 # CDDL HEADER END
 #
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
-# Copyright 2012 Joyent, Inc.  All rights reserved.
+# Copyright 2018 Joyent, Inc.  All rights reserved.
 # Copyright 2017 Nexenta Systems, Inc.
 #
 
 #
 #       This Makefile defines all file modules and build rules for the

@@ -270,13 +270,10 @@
         $(CTFCONVERT_O)
 
 $(OBJS_DIR)/%.o:                $(UTSBASE)/intel/kdi/%.s
         $(COMPILE.s) -o $@ $<
 
-$(OBJS_DIR)/%.o:                $(UTSBASE)/intel/kdi/$(SUBARCH_DIR)/%.s
-        $(COMPILE.s) -o $@ $<
-
 $(OBJS_DIR)/%.o:                $(UTSBASE)/intel/zfs/%.c
         $(COMPILE.c) -o $@ $<
         $(CTFCONVERT_O)
 
 #

@@ -487,13 +484,10 @@
         @($(LHEAD) $(LINT.c) $< $(LTAIL))
 
 $(LINTS_DIR)/%.ln:              $(UTSBASE)/intel/kdi/%.s
         @($(LHEAD) $(LINT.s) $< $(LTAIL))
 
-$(LINTS_DIR)/%.ln:              $(UTSBASE)/intel/kdi/$(SUBARCH_DIR)/%.s
-        @($(LHEAD) $(LINT.s) $< $(LTAIL))
-
 $(LINTS_DIR)/%.ln:              $(UTSBASE)/intel/nskern/%.s
         @($(LHEAD) $(LINT.s) $< $(LTAIL))
 
 #
 # krtld lints