diff options
Diffstat (limited to 'usr/src/uts/intel')
| -rw-r--r-- | usr/src/uts/intel/Makefile.intel.shared | 2 | ||||
| -rw-r--r-- | usr/src/uts/intel/dlpistub/Makefile (renamed from usr/src/uts/intel/vni/Makefile) | 21 | ||||
| -rw-r--r-- | usr/src/uts/intel/ip/ip.global-objs.debug64 | 5 | ||||
| -rw-r--r-- | usr/src/uts/intel/ip/ip.global-objs.obj64 | 5 | ||||
| -rw-r--r-- | usr/src/uts/intel/os/name_to_major | 2 |
5 files changed, 17 insertions, 18 deletions
diff --git a/usr/src/uts/intel/Makefile.intel.shared b/usr/src/uts/intel/Makefile.intel.shared index 9585034efb..b25c2fb0cc 100644 --- a/usr/src/uts/intel/Makefile.intel.shared +++ b/usr/src/uts/intel/Makefile.intel.shared @@ -216,6 +216,7 @@ DRV_KMODS += cryptoadm DRV_KMODS += dda DRV_KMODS += devinfo DRV_KMODS += dld +DRV_KMODS += dlpistub DRV_KMODS += dmd DRV_KMODS_32 += dnet DRV_KMODS += dump @@ -321,7 +322,6 @@ DRV_KMODS += udp6 DRV_KMODS += ucode DRV_KMODS += ural DRV_KMODS += vgatext -DRV_KMODS += vni DRV_KMODS += vnic DRV_KMODS += vscan DRV_KMODS += wc diff --git a/usr/src/uts/intel/vni/Makefile b/usr/src/uts/intel/dlpistub/Makefile index aa32704615..53cf2092a7 100644 --- a/usr/src/uts/intel/vni/Makefile +++ b/usr/src/uts/intel/dlpistub/Makefile @@ -18,18 +18,11 @@ # # CDDL HEADER END # -# -# uts/intel/vni/Makefile -# -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# This makefile drives the production of the vni streams kernel -# module. -# -# intel architecture dependent +# This makefile drives the production of the dlpistub STREAMS module. +# intel architecture dependent # # @@ -40,11 +33,11 @@ UTSBASE = ../.. # # Define the module and object file sets. # -MODULE = vni -OBJECTS = $(VNI_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(VNI_OBJS:%.o=$(LINTS_DIR)/%.ln) +MODULE = dlpistub +OBJECTS = $(DLPISTUB_OBJS:%=$(OBJS_DIR)/%) +LINTS = $(DLPISTUB_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -CONF_SRCDIR = $(UTSBASE)/common/inet/vni +CONF_SRCDIR = $(UTSBASE)/common/inet/dlpistub # # Include common rules. diff --git a/usr/src/uts/intel/ip/ip.global-objs.debug64 b/usr/src/uts/intel/ip/ip.global-objs.debug64 index 3972f1b4ec..d89224677b 100644 --- a/usr/src/uts/intel/ip/ip.global-objs.debug64 +++ b/usr/src/uts/intel/ip/ip.global-objs.debug64 @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -161,6 +161,9 @@ ipinfov4 ipinfov6 iplrinit iplwinit +ipmp_aract_template +ipmp_ardeact_template +ipmp_kstats iprinitv4 iprinitv6 ipsec_action_cache diff --git a/usr/src/uts/intel/ip/ip.global-objs.obj64 b/usr/src/uts/intel/ip/ip.global-objs.obj64 index f6a97be29b..0e58fdc219 100644 --- a/usr/src/uts/intel/ip/ip.global-objs.obj64 +++ b/usr/src/uts/intel/ip/ip.global-objs.obj64 @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -160,6 +160,9 @@ ipinfov4 ipinfov6 iplrinit iplwinit +ipmp_aract_template +ipmp_ardeact_template +ipmp_kstats iprinitv4 iprinitv6 ipsec_action_cache diff --git a/usr/src/uts/intel/os/name_to_major b/usr/src/uts/intel/os/name_to_major index 3d58c314b7..eb70695abd 100644 --- a/usr/src/uts/intel/os/name_to_major +++ b/usr/src/uts/intel/os/name_to_major @@ -102,7 +102,7 @@ kmdb 171 sctp 172 sctp6 173 scsi_vhci 174 -vni 175 +dlpistub 175 cpuid 176 bmc 177 dld 178 |