summaryrefslogtreecommitdiff
path: root/usr/src/uts/sparc
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/uts/sparc')
-rw-r--r--usr/src/uts/sparc/Makefile.sparc.shared5
-rw-r--r--usr/src/uts/sparc/dlpistub/Makefile (renamed from usr/src/uts/sparc/vni/Makefile)21
-rw-r--r--usr/src/uts/sparc/ip/ip.global-objs.debug645
-rw-r--r--usr/src/uts/sparc/ip/ip.global-objs.obj645
-rw-r--r--usr/src/uts/sparc/os/name_to_major2
5 files changed, 19 insertions, 19 deletions
diff --git a/usr/src/uts/sparc/Makefile.sparc.shared b/usr/src/uts/sparc/Makefile.sparc.shared
index 3723be6f32..39fba551aa 100644
--- a/usr/src/uts/sparc/Makefile.sparc.shared
+++ b/usr/src/uts/sparc/Makefile.sparc.shared
@@ -20,7 +20,7 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# This makefile contains the common definitions for all sparc
@@ -216,7 +216,8 @@ DRV_KMODS += ippctl sctp sctp6
DRV_KMODS += dld
DRV_KMODS += ipf
DRV_KMODS += rpcib
-DRV_KMODS += vni vnic
+DRV_KMODS += dlpistub
+DRV_KMODS += vnic
DRV_KMODS += xge
DRV_KMODS += rds
DRV_KMODS += chxge
diff --git a/usr/src/uts/sparc/vni/Makefile b/usr/src/uts/sparc/dlpistub/Makefile
index 6a96edc17e..548361738a 100644
--- a/usr/src/uts/sparc/vni/Makefile
+++ b/usr/src/uts/sparc/dlpistub/Makefile
@@ -18,18 +18,11 @@
#
# CDDL HEADER END
#
-#
-# uts/sparc/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.
-#
-# sparc architecture dependent
+# This makefile drives the production of the dlpistub STREAMS module.
+# sparc 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/sparc/ip/ip.global-objs.debug64 b/usr/src/uts/sparc/ip/ip.global-objs.debug64
index 279bd92d0b..6606b472bf 100644
--- a/usr/src/uts/sparc/ip/ip.global-objs.debug64
+++ b/usr/src/uts/sparc/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/sparc/ip/ip.global-objs.obj64 b/usr/src/uts/sparc/ip/ip.global-objs.obj64
index 4f4bc3e376..89d40afbbb 100644
--- a/usr/src/uts/sparc/ip/ip.global-objs.obj64
+++ b/usr/src/uts/sparc/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/sparc/os/name_to_major b/usr/src/uts/sparc/os/name_to_major
index ff58cf5113..9702d00ad7 100644
--- a/usr/src/uts/sparc/os/name_to_major
+++ b/usr/src/uts/sparc/os/name_to_major
@@ -182,7 +182,7 @@ pic16f819 233
kmdb 234
sctp 235
sctp6 236
-vni 237
+dlpistub 237
cpuid 238
did 239
ntwdt 240