4027 remove CLOSED_BUILD

4028 remove CLOSED_IS_PRESENT 4029 remove tonic build bits Reviewed by: Andy Stormont <andyjstormont@gmail.com> Reviewed by: Richard Lowe <richlowe@richlowe.net> Approved by: Richard Lowe <richlowe@richlowe.net>
author: Josef 'Jeff' Sipek <jeffpc@josefsipek.net> 2013-10-15 00:21:04 -0400
committer: Richard Lowe <richlowe@richlowe.net> 2013-10-23 19:52:25 -0400
commit: c0e7977a434048a8bc7386ea0e8befaa77a646cf (patch)
tree: 283ae7c385818ecd7d479cdfb593604c703193ac
parent: e7eebcf69de21d2c4df15f003919cdb19b61c694 (diff)
download: illumos-gate-c0e7977a434048a8bc7386ea0e8befaa77a646cf.tar.gz
61 files changed, 109 insertions, 1034 deletions
diff --git a/usr/src/Makefile b/usr/src/Makefile
index 9f817ea2db..ef522a4817 100644
--- a/usr/src/Makefile
+++ b/usr/src/Makefile
@@ -135,22 +135,20 @@ clobber_local:
 
 closedbins: bldtools $(ROOTDIRS) FRC
 	@CLOSED_ROOT="$$ON_CLOSED_BINS/root_$(MACH)$${RELEASE_BUILD+-nd}"; \
-	if [ "$$CLOSED_IS_PRESENT" = no ]; then \
-		if [ ! -d "$$CLOSED_ROOT" ]; then \
-			$(ECHO) "Error: if closed sources are not present," \
-			    "ON_CLOSED_BINS must point to closed binaries."; \
-			$(ECHO) "root_$(MACH)$${RELEASE_BUILD+-nd} is not" \
-			    "present in $$ON_CLOSED_BINS."; \
-			exit 1; \
-		fi; \
-		$(ECHO) "Copying closed binaries from $$CLOSED_ROOT"; \
-		(cd $$CLOSED_ROOT; \
-		    $(TAR) cfX - $(CODEMGR_WS)/exception_lists/closed-bins .) | \
-		    (cd $(ROOT); $(TAR) xBpf -); \
-		( cd $(ROOT); $(CTFSTRIP) $$(cd $$CLOSED_ROOT; $(FIND) \
-		    ./kernel ./usr/kernel ./platform/*/kernel -type f -a -perm -u+x | \
-		    $(EGREP) -vf $(CODEMGR_WS)/exception_lists/closed-bins) ); \
-	fi
+	if [ ! -d "$$CLOSED_ROOT" ]; then \
+		$(ECHO) "Error: ON_CLOSED_BINS must point to closed" \
+		    "binaries."; \
+		$(ECHO) "root_$(MACH)$${RELEASE_BUILD+-nd} is not" \
+		    "present in $$ON_CLOSED_BINS."; \
+		exit 1; \
+	fi; \
+	$(ECHO) "Copying closed binaries from $$CLOSED_ROOT"; \
+	(cd $$CLOSED_ROOT; \
+	    $(TAR) cfX - $(CODEMGR_WS)/exception_lists/closed-bins .) | \
+	    (cd $(ROOT); $(TAR) xBpf -); \
+	( cd $(ROOT); $(CTFSTRIP) $$(cd $$CLOSED_ROOT; $(FIND) \
+	    ./kernel ./usr/kernel ./platform/*/kernel -type f -a -perm -u+x | \
+	    $(EGREP) -vf $(CODEMGR_WS)/exception_lists/closed-bins) )
 
 #
 # Declare what parts can be built in parallel
@@ -213,10 +211,8 @@ check:	$(CHKHDRSUBDIRS) $(CHKMFSTSUBDIRS)
 # Cross-reference customization: skip all of the subdirectories that
 # don't contain actual source code.
 #
-$(CLOSED_BUILD)XRDIRS += ../closed
 XRPRUNE = pkg prototypes
 XRINCDIRS = uts/common head ucbhead
-$(CLOSED_BUILD)XRINCDIRS = uts/common ../closed/uts/common head ucbhead
 
 cscope.out tags: FRC
 	$(XREF) -f -x $@
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index afca9302ce..669ebacc57 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -48,11 +48,6 @@ NATIVE_ADJUNCT=	/usr
 # identification strings. Enabling RELEASE_BUILD automatically enables
 # INTERNAL_RELEASE_BUILD.
 #
-# CLOSED_BUILD controls whether we try to build files under
-# usr/closed.  ("" means to build closed code, "#" means don't try to
-# build it.)  Skipping the closed code implies doing an export release
-# build.
-#
 # STRIP_COMMENTS toggles comment section striping. Generally the same setting
 # as INTERNAL_RELEASE_BUILD.
 #
@@ -81,10 +76,6 @@ $(RELEASE_BUILD)NOT_RELEASE_BUILD=	$(POUND_SIGN)
 $(RELEASE_BUILD)INTERNAL_RELEASE_BUILD=
 PATCH_BUILD=				$(POUND_SIGN)
 
-# If CLOSED_IS_PRESENT is not set, assume the closed tree is present.
-CLOSED_BUILD_1=	$(CLOSED_IS_PRESENT:yes=)
-CLOSED_BUILD=	$(CLOSED_BUILD_1:no=$(POUND_SIGN))
-
 # SPARC_BLD is '#' for an Intel build.
 # INTEL_BLD is '#' for a Sparc build.
 SPARC_BLD_1=    $(MACH:i386=$(POUND_SIGN))
@@ -94,16 +85,6 @@ INTEL_BLD=      $(INTEL_BLD_1:i386=)
 
 STRIP_COMMENTS=	$(INTERNAL_RELEASE_BUILD)
 
-# Are we building tonic closedbins? Unless you have used the
-# -O flag to nightly or bldenv, leave the definition of TONICBUILD
-# as $(POUND_SIGN).
-#
-# IF YOU CHANGE CLOSEDROOT, you MUST change install.bin
-# to match the new definition.
-TONICBUILD=     $(POUND_SIGN)
-$(TONICBUILD)CLOSEDROOT= $(ROOT)-closed
-
-
 # The variables below control the compilers used during the build.
 # There are a number of permutations.
 #
@@ -247,12 +228,6 @@ MANIFEST_CHECK=	\
 	SVCCFG_CONFIGD_PATH=$(SRC)/cmd/svc/configd/svc.configd-native \
 	$(SRC)/cmd/svc/svccfg/svccfg-native validate $<
 
-#
-# IMPORTANT:: If you change any of INS.file, INS.dir, INS.rename,
-# INS.link or INS.symlink here, then you must also change the
-# corresponding override definitions in $CLOSED/Makefile.tonic.
-# If you do not do this, then the closedbins build for the OpenSolaris
-# community will break. PS, the gatekeepers will be upset too.
 INS.file=	$(RM) $@; $(INS) -s -m $(FILEMODE) -f $(@D) $<
 INS.dir=	$(INS) -s -d -m $(DIRMODE) $@
 # installs and renames at once
diff --git a/usr/src/cmd/Makefile b/usr/src/cmd/Makefile
index 5c05a088f5..1fa2a43e8f 100644
--- a/usr/src/cmd/Makefile
+++ b/usr/src/cmd/Makefile
@@ -469,19 +469,6 @@ COMMON_SUBDIRS=		\
 	zstreamdump	\
 	ztest
 
-$(CLOSED_BUILD)COMMON_SUBDIRS += \
-	$(CLOSED)/cmd/iconv	\
-	$(CLOSED)/cmd/ksh	\
-	$(CLOSED)/cmd/localedef	\
-	$(CLOSED)/cmd/more_xpg4	\
-	$(CLOSED)/cmd/mtst	\
-	$(CLOSED)/cmd/od	\
-	$(CLOSED)/cmd/patch	\
-	$(CLOSED)/cmd/pax	\
-	$(CLOSED)/cmd/printf	\
-	$(CLOSED)/cmd/sed	\
-	$(CLOSED)/cmd/sed_xpg4
-
 i386_SUBDIRS=		\
 	acpihpd		\
 	addbadsec	\
@@ -751,18 +738,6 @@ MSGSUBDIRS=		\
 	zpool		\
 	zonestat
 
-$(CLOSED_BUILD)MSGSUBDIRS += \
-	$(CLOSED)/cmd/iconv	\
-	$(CLOSED)/cmd/ksh	\
-	$(CLOSED)/cmd/localedef	\
-	$(CLOSED)/cmd/more_xpg4	\
-	$(CLOSED)/cmd/od	\
-	$(CLOSED)/cmd/patch	\
-	$(CLOSED)/cmd/pax	\
-	$(CLOSED)/cmd/printf	\
-	$(CLOSED)/cmd/sed	\
-	$(CLOSED)/cmd/sed_xpg4
-
 sparc_MSGSUBDIRS=	\
 	fruadm		\
 	prtdscp		\
@@ -789,9 +764,6 @@ DCSUBDIRS=		\
 	whodo		\
 	write
 
-$(CLOSED_BUILD)DCSUBDIRS += \
-	$(CLOSED)/cmd/pax
-
 #
 # commands that belong only to audit.
 #
diff --git a/usr/src/cmd/cmd-crypto/Makefile b/usr/src/cmd/cmd-crypto/Makefile
index 2571d48dc9..c23513d431 100644
--- a/usr/src/cmd/cmd-crypto/Makefile
+++ b/usr/src/cmd/cmd-crypto/Makefile
@@ -32,16 +32,10 @@ SUBDIRS1 = \
 	pktool \
 	tpmadm
 
-$(CLOSED_BUILD)SUBDIRS1 += \
-	$(CLOSED)/cmd/cmd-crypto/kcfd
-
 SUBDIRS2 = \
 	etc \
 	scripts
 
-$(CLOSED_BUILD)SUBDIRS2 += \
-	$(CLOSED)/cmd/cmd-crypto/etc
-
 all:=           TARGET= all
 install:=       TARGET= install
 clean:=         TARGET= clean
diff --git a/usr/src/cmd/cmd-inet/usr.lib/Makefile b/usr/src/cmd/cmd-inet/usr.lib/Makefile
index dcf3af1ae4..db8505ec87 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.lib/Makefile
@@ -33,10 +33,6 @@ MSGSUBDIRS=	dsvclockd ilbd in.dhcpd inetd ncaconfd vrrpd wanboot
 include ../../Makefile.cmd
 include ./Makefile.lib
 
-$(CLOSED_BUILD)SUBDIRS += \
-	$(CLOSED)/cmd/cmd-inet/usr.lib/ike-certutils \
-	$(CLOSED)/cmd/cmd-inet/usr.lib/in.iked
-
 POFILES=	dsvclockd/dsvclockd.po in.dhcpd/in.dhcpd.po \
 		inetd/inetd.po ncaconfd/ncaconfd.po vrrpd/vrrpd.po \
 		wanboot/wanboot.po
diff --git a/usr/src/cmd/fwflash/plugins/Makefile b/usr/src/cmd/fwflash/plugins/Makefile
index 01ffa9f559..036159eb65 100644
--- a/usr/src/cmd/fwflash/plugins/Makefile
+++ b/usr/src/cmd/fwflash/plugins/Makefile
@@ -27,7 +27,6 @@
 include $(SRC)/Makefile.master
 
 COMMON_SUBDIRS=	$(MACH)
-$(CLOSED_BUILD)COMMON_SUBDIRS += $(CLOSED)/cmd/fwflash/plugins 
 
 SUBDIRS=	$(COMMON_SUBDIRS)
 
diff --git a/usr/src/cmd/mdb/intel/amd64/Makefile b/usr/src/cmd/mdb/intel/amd64/Makefile
index ac1c06fa9d..e51c3c5a69 100644
--- a/usr/src/cmd/mdb/intel/amd64/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/Makefile
@@ -27,9 +27,6 @@ include ../../Makefile.common
 
 MODULES = $(COMMON_MODULES_PROC) $(COMMON_MODULES_KVM) uhci
 
-$(CLOSED_BUILD)MODULES += \
-	$(CLOSED_COMMON_MODULES_KVM:%=$(CLOSED)/cmd/mdb/intel/amd64/%)
-
 SUBDIRS = mdb mdb_ks kmdb libstandctf libstand .WAIT $(MODULES)
 
 include ../../Makefile.subdirs
diff --git a/usr/src/cmd/mdb/intel/ia32/Makefile b/usr/src/cmd/mdb/intel/ia32/Makefile
index 1a9803b355..ff10e15ff0 100644
--- a/usr/src/cmd/mdb/intel/ia32/Makefile
+++ b/usr/src/cmd/mdb/intel/ia32/Makefile
@@ -28,9 +28,6 @@ include ../../Makefile.common
 MODULES = $(COMMON_MODULES_PROC) $(COMMON_MODULES_PROC_32BIT) \
     $(COMMON_MODULES_KVM) uhci
 
-$(CLOSED_BUILD)MODULES += \
-	$(CLOSED_COMMON_MODULES_KVM:%=$(CLOSED)/cmd/mdb/intel/ia32/%)
-
 SUBDIRS = mdb mdb_ks kmdb libstandctf libstand .WAIT $(MODULES)
 
 include ../../Makefile.subdirs
diff --git a/usr/src/cmd/mdb/sparc/v9/Makefile b/usr/src/cmd/mdb/sparc/v9/Makefile
index 6a5ef88df2..74a0622f4b 100644
--- a/usr/src/cmd/mdb/sparc/v9/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/Makefile
@@ -22,7 +22,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 include ../../Makefile.common
 
@@ -32,11 +31,6 @@ MODULES = \
 	intr \
 	ssd
 
-$(CLOSED_BUILD)MODULES += \
-	$(CLOSED_COMMON_MODULES_KVM:%=$(CLOSED)/cmd/mdb/sparc/v9/%)
-$(CLOSED_BUILD)MODULES += \
-	$(CLOSED)/cmd/mdb/sparc/v9/isp
-
 #
 # a "$(MODULES): kmdb" rule would seem to do the trick but, for some reason,
 # it serializes $(MODULES).
diff --git a/usr/src/cmd/tsol/Makefile b/usr/src/cmd/tsol/Makefile
index 9163f24351..98d1e0ae26 100644
--- a/usr/src/cmd/tsol/Makefile
+++ b/usr/src/cmd/tsol/Makefile
@@ -22,8 +22,6 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # cmd/tsol/Makefile
 #
 
@@ -58,12 +56,6 @@ MSGSUBDIRS =		\
 	tnd		\
 	getzonepath
 
-$(CLOSED_BUILD)SUBDIRS += $(CLOSED)/cmd/tsol/chk_encodings \
-	$(CLOSED)/cmd/tsol/labeld
-
-$(CLOSED_BUILD)CLOSED_MSGSUBDIRS = $(CLOSED)/cmd/tsol/chk_encodings \
-	$(CLOSED)/cmd/tsol/labeld
-
 #
 # for messaging catalog
 #
diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile
index 7fb2733cc8..fe1035b59b 100644
--- a/usr/src/lib/Makefile
+++ b/usr/src/lib/Makefile
@@ -45,13 +45,6 @@ include ../Makefile.master
 #
 .PARALLEL:
 
-#
-# The $(CLOSED_BUILD) additions to SUBDIRS & MSGSUBDIRS are unfortunate,
-# but required due to the "dependencies" of using .WAIT to barrier the
-# parallel dmake builds.  once 4631488 has been fixed, they can be
-# consolidated into one $(CLOSED_BUILD)SUBDIRS += (all closed libs) as
-# shown in HDRSUBDIRS
-#
 SUBDIRS= \
 	common			.WAIT	\
 	../cmd/sgs/libconv		\
@@ -183,10 +176,7 @@ SUBDIRS += \
 	libdhcpdu	\
 	libdhcputil	\
 	libxnet		\
-	libipsecutil
-$(CLOSED_BUILD)SUBDIRS += \
-	$(CLOSED)/lib/libike
-SUBDIRS += \
+	libipsecutil	\
 	nsswitch	\
 	print		\
 	libuutil	\
@@ -512,9 +502,6 @@ HDRSUBDIRS=		\
 	libreparse	\
 	$($(MACH)_HDRSUBDIRS)
 
-$(CLOSED_BUILD)HDRSUBDIRS += \
-	$(CLOSED)/lib/libike
-
 i386_HDRSUBDIRS=	\
 	libparted	\
 	libfdisk	\
@@ -607,7 +594,6 @@ libnsl:		libmd5
 libmapid:	libresolv
 librdc:		libsocket libnsl libnsctl libunistat libdscfg
 libuuid:	libdlpi
-$(CLOSED_BUILD)libike:	libipsecutil libxnet libcryptoutil
 libinetutil:	libsocket
 libipsecutil:	libtecla libsocket
 libinstzones:	libzonecfg libcontract
diff --git a/usr/src/lib/Makefile.lib b/usr/src/lib/Makefile.lib
index 2ec26c5c8b..78ef2cd4b5 100644
--- a/usr/src/lib/Makefile.lib
+++ b/usr/src/lib/Makefile.lib
@@ -159,13 +159,6 @@ BUILD.SO=	$(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) $(EXTPICS) $(LDLIBS)
 BUILDCCC.SO=	$(CCC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) $(EXTPICS) $(LDLIBS)
 
 # default dynamic library symlink
-# IMPORTANT:: If you change INS.liblink OR INS.liblink64 here, then you 
-# MUST also change the corresponding override definitions in
-# $CLOSED/Makefile.tonic.
-#
-# If you do not do this, then the closedbins build for the OpenSolaris
-# community will break. PS, the gatekeepers will be upset too.
-#
 INS.liblink=	-$(RM) $@; $(SYMLINK) $(LIBLINKPATH)$(LIBLINKS)$(VERS) $@
 INS.liblinkccc=	-$(RM) $@; $(SYMLINK) $(LIBLINKPATH)$(LIBLINKSCCC)$(VERS) $@
 
diff --git a/usr/src/lib/raidcfg_plugins/Makefile b/usr/src/lib/raidcfg_plugins/Makefile
index ec46aed318..cde7f25413 100644
--- a/usr/src/lib/raidcfg_plugins/Makefile
+++ b/usr/src/lib/raidcfg_plugins/Makefile
@@ -22,17 +22,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # lib/raidcfg_plugins/Makefile
 #
 
 include $(SRC)/Makefile.master
 
-CLOSED_PLUGIN = $(CLOSED)/lib/raidcfg_plugins/
-
-$(CLOSED_BUILD)COMMON_SUBDIRS += $(CLOSED_PLUGIN)/mpt
-
 SUBDIRS= $(COMMON_SUBDIRS) $($(MACH)_SUBDIRS)
 
 all:= 		TARGET= all
diff --git a/usr/src/pkg/Makefile.lic b/usr/src/pkg/Makefile.lic
index 10a46633aa..b21b013cc3 100644
--- a/usr/src/pkg/Makefile.lic
+++ b/usr/src/pkg/Makefile.lic
@@ -41,23 +41,10 @@ $(LICROOT)/usr/src/%: $(CODEMGR_WS)/usr/src/%
 	$(PKGDEBUG)$(INS.file)
 
 #
-# For license files in the closed source tree, the desired action
-# depends on the type of build.
+# A build without closed source relies on closed-bins extraction to stage
+# the license file and does nothing here.
 #
-# 1. For a normal build, with closed source present, simply copy the
-#    file into the license staging directory.
-#
-# 2. For a Tonic build, copy the file into both open and closed
-#    license staging directories.
-#
-# 3. For a build without closed source, rely on closed-bins extraction
-#    to stage the license file, and do nothing here.
-#
-$(TONICBUILD)INS= install -O
-$(LICROOT)/usr/closed/%: $(CLOSED_BUILD) $(CODEMGR_WS)/usr/closed/%
-	$(CLOSED_BUILD)$(PKGDEBUG) \
+$(LICROOT)/usr/closed/%:
 	if [ ! -d $(@D) ]; then \
 		mkdir -p $(@D); \
 	fi; \
-	$(TONICBUILD) $(RM) $(@:$(ROOT)/%=$(CLOSEDROOT)/%)
-	$(CLOSED_BUILD)$(PKGDEBUG)$(INS.file)
diff --git a/usr/src/psm/stand/boot/Makefile b/usr/src/psm/stand/boot/Makefile
index a2465ea075..e04bea902f 100644
--- a/usr/src/psm/stand/boot/Makefile
+++ b/usr/src/psm/stand/boot/Makefile
@@ -64,8 +64,6 @@ XRDIRS += 	$(STANDLIBDIR) $(STANDSYSDIRS) $(PROMDIRS) $(NAMESDIRS)
 XRINCCOMP = B!sun4u O!sfmmu O!sparc/v7 O!sparc/v9 B!sparc B!sun B!common
 XRINC_TMP = $(XRINCCOMP:B!%=$(UTSDIR)/%)
 XRINCDIRS = $(XRINC_TMP:O!%=$(UTSDIR)/%)
-$(CLOSED_BUILD)XRINC_TMP = $(XRINCCOMP:B!%=$(UTSDIR)/% $(UTSCLOSED)/%)
-$(CLOSED_BUILD)XRINCDIRS = $(XRINC_TMP:O!%=$(UTSDIR)/%)
 
 cscope.out tags: FRC
 	$(XREF) -x $@
diff --git a/usr/src/tools/env/developer.sh b/usr/src/tools/env/developer.sh
index fb0416e0ce..988c11c98b 100644
--- a/usr/src/tools/env/developer.sh
+++ b/usr/src/tools/env/developer.sh
@@ -61,12 +61,6 @@ CLONE_WS="ssh://anonhg@onnv.sfbay.sun.com//export/onnv-clone";	export CLONE_WS
 # the usr/closed tree.
 CLOSED_CLONE_WS="${CLONE_WS}/usr/closed";	export CLOSED_CLONE_WS
 
-# This flag controls whether to build the closed source.  If
-# undefined, nightly(1) and bldenv(1) will set it according to whether
-# the closed source tree is present.  CLOSED_IS_PRESENT="no" means not
-# building the closed sources.
-# CLOSED_IS_PRESENT="yes";		export CLOSED_IS_PRESENT
-
 # The bringover, if any, is done as STAFFER.
 # Set STAFFER to your own login as gatekeeper or developer
 # The point is to use group "staff" and avoid referencing the parent
diff --git a/usr/src/tools/env/gatekeeper.sh b/usr/src/tools/env/gatekeeper.sh
index cdc32d446b..f801ee920a 100644
--- a/usr/src/tools/env/gatekeeper.sh
+++ b/usr/src/tools/env/gatekeeper.sh
@@ -70,12 +70,6 @@ CLONE_WS="ssh://anonhg@onnv.sfbay.sun.com//export/onnv-clone";	export CLONE_WS
 CLOSED_CLONE_WS="${CLONE_WS}/usr/closed"
 export CLOSED_CLONE_WS
 
-# This flag controls whether to build the closed source.  If
-# undefined, nightly(1) and bldenv(1) will set it according to whether
-# the closed source tree is present.  CLOSED_IS_PRESENT="no" means not
-# building the closed sources.
-# CLOSED_IS_PRESENT="yes";		export CLOSED_IS_PRESENT
-
 # The bringover, if any, is done as STAFFER.
 # Set STAFFER to your own login as gatekeeper or integration engineer.
 # The point is to use group "staff" and avoid referencing the parent
diff --git a/usr/src/tools/findunref/Makefile b/usr/src/tools/findunref/Makefile
index 7023c2ab35..4986ae6aa6 100644
--- a/usr/src/tools/findunref/Makefile
+++ b/usr/src/tools/findunref/Makefile
@@ -37,7 +37,6 @@ CERRWARN += -_gcc=-Wno-parentheses
 $(ROOTONBLDMAN1FILES) := FILEMODE=      644
 
 EXCEPTION_SRC= common open
-$(CLOSED_BUILD)EXCEPTION_SRC += closed
 EXCEPTION_LISTS=	$(EXCEPTION_SRC:%=exception_list.%)
 
 CLOBBERFILES += exception_list
diff --git a/usr/src/tools/findunref/exception_list.closed b/usr/src/tools/findunref/exception_list.closed
index e13d6c1533..e81e3e4092 100644
--- a/usr/src/tools/findunref/exception_list.closed
+++ b/usr/src/tools/findunref/exception_list.closed
@@ -68,10 +68,3 @@
 ./usr/closed/uts/common/io/bnx/tcp_ctx.h
 ./usr/closed/uts/common/io/bnx/toe_ctx.h
 ./usr/closed/uts/common/io/bnx/bnxdbg.c
-
-#
-# Ignore Makefile.tonic - not used unless we're running an
-# OpenSolaris closedbins delivery build
-#
-./usr/closed/Makefile.tonic
-
diff --git a/usr/src/tools/install.bin/install.bin.c b/usr/src/tools/install.bin/install.bin.c
index dfae83f700..40234e5c01 100644
--- a/usr/src/tools/install.bin/install.bin.c
+++ b/usr/src/tools/install.bin/install.bin.c
@@ -45,7 +45,6 @@ static int suppress = 0;
 static void usage(void);
 static void file_copy(char *src_file, char *dest_file);
 static void chown_file(const char *file, const char *group, const char *owner);
-static void formclosed(char *root, char *closedroot);
 static char *find_basename(const char *str);
 static int creatdir(char *fn);
 
@@ -54,7 +53,7 @@ void
 usage(void)
 {
 	(void) fprintf(stderr,
-	    "usage: install [-sdO][-m mode][-g group][-u owner] "
+	    "usage: install [-sd][-m mode][-g group][-u owner] "
 	    "-f dir file ...\n");
 }
 
@@ -125,23 +124,6 @@ chown_file(const char *file, const char *group, const char *owner)
 }
 
 
-void
-formclosed(char *root, char *closedroot)
-{
-	int wholelen, residlen;
-	char *temp;
-
-	wholelen = strlen(root);
-	temp = strstr(strstr(root, "proto/root_"), "/");
-	temp++;
-	temp = strstr(temp, "/");
-	residlen = strlen(temp);
-	(void) strlcpy(closedroot, root, wholelen - residlen + 1);
-	(void) strlcat(closedroot, "-closed", MAXPATHLEN);
-	(void) strlcat(closedroot, temp, MAXPATHLEN);
-}
-
-
 char *
 find_basename(const char *str)
 {
@@ -183,12 +165,9 @@ main(int argc, char **argv)
 	char	*ins_file = NULL;
 	int	mode = -1;
 	char	dest_file[MAXPATHLEN];
-	char    shadow_dest[MAXPATHLEN];
-	char	shadow_dirb[MAXPATHLEN];
-	int	tonic = 0;
 	int	rv = 0;
 
-	while ((c = getopt(argc, argv, "f:sm:du:g:O")) != EOF) {
+	while ((c = getopt(argc, argv, "f:sm:du:g:")) != EOF) {
 		switch (c) {
 		case 'f':
 			dirb = optarg;
@@ -208,9 +187,6 @@ main(int argc, char **argv)
 		case 's':
 			suppress = 1;
 			break;
-		case 'O':
-			tonic = 1;
-			break;
 		case '?':
 			errflg++;
 			break;
@@ -237,18 +213,6 @@ main(int argc, char **argv)
 		ins_file = argv[c];
 
 		if (dirflg) {
-			if (tonic) {
-				formclosed(ins_file, shadow_dest);
-				rv = creatdir(shadow_dest);
-				if (rv) {
-					(void) fprintf(stderr,
-					    "install: tonic creatdir "
-					    "%s (%d): (%s)\n",
-					    shadow_dest, errno,
-					    strerror(errno));
-					return (rv);
-				}
-			}
 			rv = creatdir(ins_file);
 			if (rv) {
 				(void) fprintf(stderr,
@@ -262,38 +226,11 @@ main(int argc, char **argv)
 			(void) strcat(strcat(strcpy(dest_file, dirb), "/"),
 			    find_basename(ins_file));
 			file_copy(ins_file, dest_file);
-
-			if (tonic) {
-				formclosed(dirb, shadow_dirb);
-				/*
-				 * The standard directories in the proto
-				 * area are created as part of "make setup",
-				 * but that doesn't create them in the
-				 * closed proto area. So if the target
-				 * directory doesn't exist, we need to
-				 * create it now.
-				 */
-				rv = creatdir(shadow_dirb);
-				if (rv) {
-					(void) fprintf(stderr,
-					    "install: tonic creatdir(f) "
-					    "%s (%d): %s\n",
-					    shadow_dirb, errno,
-					    strerror(errno));
-					return (rv);
-				}
-				(void) strcat(strcat(strcpy(shadow_dest,
-				    shadow_dirb), "/"),
-				    find_basename(ins_file));
-				file_copy(ins_file, shadow_dest);
-			}
 		}
 
-		if (group || owner) {
+		if (group || owner)
 			chown_file(dest_file, group, owner);
-			if (tonic)
-				chown_file(shadow_dest, group, owner);
-		}
+
 		if (mode != -1) {
 			(void) umask(0);
 			if (chmod(dest_file, mode) == -1) {
@@ -303,16 +240,6 @@ main(int argc, char **argv)
 				    dest_file, mode, errno, strerror(errno));
 				return (1);
 			}
-			if (tonic) {
-				if (chmod(shadow_dest, mode) == -1) {
-					(void) fprintf(stderr,
-					    "install: tonic chmod of %s "
-					    "to mode %o failed (%d): %s\n",
-					    shadow_dest, mode,
-					    errno, strerror(errno));
-					return (1);
-				}
-			}
 		}
 	}
 	return (0);
diff --git a/usr/src/tools/scripts/Install.sh b/usr/src/tools/scripts/Install.sh
index 0632846b8b..909cb4b3c3 100644
--- a/usr/src/tools/scripts/Install.sh
+++ b/usr/src/tools/scripts/Install.sh
@@ -732,13 +732,9 @@ function copy_kmdb {
 	fi
 
 	srctrees=$SRC
-	if [[ -d $SRC/../closed && "$CLOSED_IS_PRESENT" != no ]]; then
-		srctrees="$srctrees $SRC/../closed"
-	else
-		if [ -z "$ON_CRYPTO_BINS" ]; then
-			echo "Warning: ON_CRYPTO_BINS not set; pre-signed" \
-			    "crypto not provided."
-		fi
+	if [ -z "$ON_CRYPTO_BINS" ]; then
+		echo "Warning: ON_CRYPTO_BINS not set; pre-signed" \
+		    "crypto not provided."
 	fi
 	if [[ $WANT64 = "yes" ]] ; then
 		# kmdbmod for sparc and x86 are built and installed
diff --git a/usr/src/tools/scripts/bldenv.sh b/usr/src/tools/scripts/bldenv.sh
index 4720b7925e..9ffdb67839 100644
--- a/usr/src/tools/scripts/bldenv.sh
+++ b/usr/src/tools/scripts/bldenv.sh
@@ -345,14 +345,6 @@ if [[ "${SUNWSPRO}" != "" ]]; then
 	export PATH="${SUNWSPRO}/bin:$PATH" 
 fi 
 
-if [[ -z "$CLOSED_IS_PRESENT" ]]; then
-	if [[ -d $SRC/../closed ]]; then
-		export CLOSED_IS_PRESENT="yes"
-	else
-		export CLOSED_IS_PRESENT="no"
-	fi
-fi
-
 TOOLS="${SRC}/tools"
 TOOLS_PROTO="${TOOLS}/proto/root_${MACH}-nd" ; export TOOLS_PROTO
 
@@ -418,19 +410,10 @@ fi
 
 [[ "$MULTI_PROTO" == "yes" ]] && export ROOT="${ROOT}${SUFFIX}"
 
-export TONICBUILD="#"
-
 if "${flags.O}" ; then 
-	if [[ "$CLOSED_IS_PRESENT" != "yes" ]]; then
-		print "OpenSolaris closed binary generation requires "
-		print "closed tree"
-		exit 1
-	fi
-	print "Generating OpenSolaris deliverables"
-	# We only need CLOSEDROOT in the env for convenience. Makefile.master
-	# figures out what it needs when it matters.
-	export CLOSEDROOT="${ROOT}-closed"
-	export TONICBUILD=""
+	print "OpenSolaris closed binary generation requires "
+	print "closed tree"
+	exit 1
 fi
 
 ENVLDLIBS1="-L$ROOT/lib -L$ROOT/usr/lib"
diff --git a/usr/src/tools/scripts/checkpaths.sh b/usr/src/tools/scripts/checkpaths.sh
index 836ed71653..cf74c7362c 100644
--- a/usr/src/tools/scripts/checkpaths.sh
+++ b/usr/src/tools/scripts/checkpaths.sh
@@ -59,11 +59,6 @@ else
 	rootlist="$CODEMGR_WS/proto/root_sparc $CODEMGR_WS/proto/root_i386"
 fi
 
-# If the closed source is not present, then exclude IKE from validation.
-if [ "$CLOSED_IS_PRESENT" = no ]; then
-	excl="-e ^usr/include/ike/"
-fi
-
 for ROOT in $rootlist
 do
 	case "$ROOT" in
@@ -84,7 +79,8 @@ do
 		# the svr4-specific usr/src/pkgdefs
 		#
 		[ -f $SRC/pkgdefs/etc/exception_list_$arch ] && \
-			validate_paths '-s/\s*'$arch'$//' $excl -b $ROOT \
+			validate_paths '-s/\s*'$arch'$//'  \
+			    -e ^usr/include/ike/ -b $ROOT \
 			    $args $SRC/pkgdefs/etc/exception_list_$arch
 		#
 		# These are the new-style packaging exception lists,
@@ -117,12 +113,9 @@ if [ -r $SRC/tools/findunref/exception_list ]; then
 fi
 
 if [ -f $SRC/tools/opensolaris/license-list ]; then
-	excl=
-	if [ "$CLOSED_IS_PRESENT" = no ]; then
-		excl="-e ^usr/closed"
-	fi
 	sed -e 's/$/.descrip/' < $SRC/tools/opensolaris/license-list | \
-		validate_paths -n SRC/tools/opensolaris/license-list $excl
+		validate_paths -n SRC/tools/opensolaris/license-list \
+		    -e ^usr/closed
 fi
 
 # Finally, make sure the that (req|inc).flg files are in good shape.
@@ -131,11 +124,7 @@ fi
 if [ ! -d "$CODEMGR_WS/Codemgr_wsdata" ]; then
 	f_flg='-f'
 fi
-# If the closed source is not present, then don't validate it.
-if [ "$CLOSED_IS_PRESENT" = no ]; then
-	excl="-e ^usr/closed/"
-fi
 
-validate_flg $f_flg $excl
+validate_flg $f_flg -e ^usr/closed/
 
 exit 0
diff --git a/usr/src/tools/scripts/nightly.sh b/usr/src/tools/scripts/nightly.sh
index 3336a3154a..a60ddcef4f 100644
--- a/usr/src/tools/scripts/nightly.sh
+++ b/usr/src/tools/scripts/nightly.sh
@@ -294,8 +294,7 @@ function copy_source {
 }
 
 #
-# Mercurial-specific copy code for copy_source().  Handles the
-# combined open and closed trees.
+# Mercurial-specific copy code for copy_source().
 #
 # Returns 0 for success, non-zero for failure.
 #
@@ -304,59 +303,12 @@ function copy_source {
 function copy_source_mercurial {
 	typeset dest=$1
 	typeset srcroot=$2
-	typeset open_top closed_top
 
-	case $srcroot in
-	usr)
-		open_top=usr
-		if [[ "$CLOSED_IS_PRESENT" = yes ]]; then
-			closed_top=usr/closed
-		fi
-		;;
-	usr/closed*)
-		if [[ "$CLOSED_IS_PRESENT" = no ]]; then
-			printf "can't copy %s: closed tree not present.\n" \
-			    "$srcroot" | tee -a $mail_msg_file >> $LOGFILE
-			return 1
-		fi
-		closed_top="$srcroot"
-		;;
-	*)
-		open_top="$srcroot"
-		;;
-	esac		
-
-	if [[ -n "$open_top" ]]; then
-		hg locate -I "$open_top" | cpio -pd "$dest" >>$LOGFILE 2>&1
-		if (( $? != 0 )) ; then
-		    printf "cpio failed for %s\n" "$dest" |
-			tee -a $mail_msg_file >> $LOGFILE
-		    return 1
-		fi
-	fi
-
-	if [[ -n "$closed_top" ]]; then
-		mkdir -p "$dest/usr/closed" || return 1
-		if [[ "$closed_top" = usr/closed ]]; then
-			(cd usr/closed; hg locate |
-			    cpio -pd "$dest/usr/closed") >>$LOGFILE 2>&1
-			if (( $? != 0 )) ; then
-			    printf "cpio failed for %s/usr/closed\n" \
-				"$dest" | tee -a $mail_msg_file >> $LOGFILE
-			    return 1
-			fi
-		else
-			# copy subtree of usr/closed
-			closed_top=${closed_top#usr/closed/}
-			(cd usr/closed; hg locate -I "$closed_top" |
-			    cpio -pd "$dest/usr/closed") >>$LOGFILE 2>&1
-			if (( $? != 0 )) ; then
-			    printf "cpio failed for %s/usr/closed/%s\n" \
-				"$dest" "$closed_top" |
-				tee -a $mail_msg_file >> $LOGFILE
-			    return 1
-			fi
-		fi
+	hg locate -I "$srcroot" | cpio -pd "$dest" >>$LOGFILE 2>&1
+	if (( $? != 0 )) ; then
+	    printf "cpio failed for %s\n" "$dest" |
+		tee -a $mail_msg_file >> $LOGFILE
+	    return 1
 	fi
 
 	return 0
@@ -893,29 +845,12 @@ function staffer {
 
 #
 # Verify that the closed tree is present if it needs to be.
-# Sets CLOSED_IS_PRESENT for future use.
 #
 function check_closed_tree {
-	if [ -z "$CLOSED_IS_PRESENT" ]; then
-		if [ -d $CODEMGR_WS/usr/closed ]; then
-			CLOSED_IS_PRESENT="yes"
-		else
-			CLOSED_IS_PRESENT="no"
-		fi
-		export CLOSED_IS_PRESENT
-	fi
-	if [[ "$CLOSED_IS_PRESENT" = no && ! -d "$ON_CLOSED_BINS" ]]; then
-		#
-		# If it's an old (pre-split) tree or an empty
-		# workspace, don't complain.
-		#
-		if grep -s CLOSED_BUILD $SRC/Makefile.master > /dev/null; then
-			echo "If the closed sources are not present," \
-			    "ON_CLOSED_BINS"
-			echo "must point to the closed binaries tree."
-			build_ok=n
-			exit 1
-		fi
+	if [[ ! -d "$ON_CLOSED_BINS" ]]; then
+		echo "ON_CLOSED_BINS must point to the closed binaries tree."
+		build_ok=n
+		exit 1
 	fi
 }
 
@@ -1264,13 +1199,6 @@ if [ "$BRINGOVER_FILES" = "" ]; then
 	BRINGOVER_FILES="usr"
 fi
 
-#
-# If the closed sources are not present, the closed binaries must be
-# present for the build to succeed.  If there's no pointer to the
-# closed binaries, flag that now, rather than forcing the user to wait
-# a couple hours (or more) to find out.
-#
-orig_closed_is_present="$CLOSED_IS_PRESENT"
 check_closed_tree
 
 #
@@ -1283,18 +1211,6 @@ while getopts +ABCDdFfGIilMmNnOoPpRrS:TtUuWwXxz FLAG $NIGHTLY_OPTIONS
 do
 	case $FLAG in
 	  A )	A_FLAG=y
-		#
-		# If ELF_DATA_BASELINE_DIR is not defined, and we are on SWAN
-		# (based on CLOSED_IS_PRESENT), then refuse to run. The value
-		# of ELF version checking is greatly enhanced by including
-		# the baseline gate comparison.
-		if [ "$CLOSED_IS_PRESENT" = 'yes' -a \
-		     "$ELF_DATA_BASELINE_DIR" = '' ]; then
-			echo "ELF_DATA_BASELINE_DIR must be set if the A" \
-			    "flag is present in\nNIGHTLY_OPTIONS and closed" \
-			    "sources are present. Update environment file."
-			exit 1;
-		fi
 		;;
 	  B )	D_FLAG=y
 		;; # old version of D
@@ -1401,13 +1317,7 @@ export PATH
 
 # roots of source trees, both relative to $SRC and absolute.
 relsrcdirs="."
-if [[ -d $CODEMGR_WS/usr/closed && "$CLOSED_IS_PRESENT" != no ]]; then
-	relsrcdirs="$relsrcdirs ../closed"
-fi
-abssrcdirs=""
-for d in $relsrcdirs; do
-	abssrcdirs="$abssrcdirs $SRC/$d"
-done
+abssrcdirs="$SRC"
 
 unset CH
 if [ "$o_FLAG" = "y" ]; then
@@ -1473,12 +1383,6 @@ fi
 export PATH
 export MAKE
 
-if [[ "$O_FLAG" = y ]]; then
-	export TONICBUILD=""
-else
-	export TONICBUILD="#"
-fi
-
 if [ "${SUNWSPRO}" != "" ]; then
 	PATH="${SUNWSPRO}/bin:$PATH"
 	export PATH
@@ -2155,25 +2059,6 @@ type bringover_mercurial > /dev/null 2>&1 || function bringover_mercurial {
 		touch $TMPDIR/new_repository
 	fi
 
-	#
-	# If the user set CLOSED_BRINGOVER_WS and didn't set CLOSED_IS_PRESENT
-	# to "no," then we'll want to initialise the closed repository
-	#
-	# We use $orig_closed_is_present instead of $CLOSED_IS_PRESENT,
-	# because for newly-created source trees, the latter will be "no"
-	# until after the bringover completes.
-	#
-	if [[ "$orig_closed_is_present" != "no" && \
-	    -n "$CLOSED_BRINGOVER_WS" && \
-	    ! -d $CODEMGR_WS/usr/closed/.hg ]]; then
-		staffer mkdir -p $CODEMGR_WS/usr/closed
-		staffer hg init $CODEMGR_WS/usr/closed
-		staffer echo "[paths]" > $CODEMGR_WS/usr/closed/.hg/hgrc
-		staffer echo "default=$CLOSED_BRINGOVER_WS" >> $CODEMGR_WS/usr/closed/.hg/hgrc
-		touch $TMPDIR/new_closed
-		export CLOSED_IS_PRESENT=yes
-	fi
-
 	typeset -x HGMERGE="/bin/false"
 
 	#
@@ -2272,69 +2157,6 @@ type bringover_mercurial > /dev/null 2>&1 || function bringover_mercurial {
 	printf "\n"
 
 	#
-	# We only want to update usr/closed if it exists, and we haven't been
-	# told not to via $CLOSED_IS_PRESENT, and we actually know where to
-	# pull from ($CLOSED_BRINGOVER_WS).
-	#
-	if [[ $CLOSED_IS_PRESENT = yes && \
-	    -d $CODEMGR_WS/usr/closed/.hg && \
-	    -n $CLOSED_BRINGOVER_WS ]]; then
-
-		HG_SOURCE=$CLOSED_BRINGOVER_WS
-		if [ ! -f $TMPDIR/new_closed ]; then
-			HG_SOURCE=$TMPDIR/closed_bundle.hg
-			staffer hg --cwd $CODEMGR_WS/usr/closed incoming \
-			    --bundle $HG_SOURCE -v $CLOSED_BRINGOVER_WS \
-			    > $TMPDIR/incoming_closed.out
-
-			#
-			# If there are no incoming changesets, then incoming will
-			# fail, and there will be no bundle file.  Reset the source,
-			# to allow the remaining logic to complete with no false
-			# negatives.  (Unlike incoming, pull will return success
-			# for the no-change case.)
-			#
-			if (( $? != 0 )); then
-				HG_SOURCE=$CLOSED_BRINGOVER_WS
-			fi
-		fi
-
-		staffer hg --cwd $CODEMGR_WS/usr/closed pull -u \
-			$HG_SOURCE > $TMPDIR/pull_closed.out 2>&1
-		if (( $? != 0 )); then
-			printf "closed pull failed as follows:\n\n"
-			cat $TMPDIR/pull_closed.out
-			if grep "^merging.*failed" $TMPDIR/pull_closed.out \
-			    > /dev/null 2>&1; then
-				printf "$mergefailmsg"
-			fi
-			touch $TMPDIR/bringover_failed
-			return
-		fi
-
-		if grep "not updating" $TMPDIR/pull_closed.out > /dev/null 2>&1; then
-			staffer hg --cwd $CODEMGR_WS/usr/closed merge \
-			    >> $TMPDIR/pull_closed.out 2>&1
-			if (( $? != 0 )); then
-				printf "closed merge failed as follows:\n\n"
-				cat $TMPDIR/pull_closed.out
-				if grep "^merging.*failed" $TMPDIR/pull_closed.out > /dev/null 2>&1; then
-					printf "$mergefailmsg"
-				fi
-				touch $TMPDIR/bringover_failed
-				return
-			fi
-		fi
-
-		printf "updated %s with the following results:\n" \
-		    "$CODEMGR_WS/usr/closed"
-		cat $TMPDIR/pull_closed.out
-		if grep "^merging" $TMPDIR/pull_closed.out > /dev/null 2>&1; then
-			printf "$mergepassmsg"
-		fi
-	fi
-
-	#
 	# Per-changeset output is neither useful nor manageable for a
 	# newly-created repository.
 	#
@@ -2431,18 +2253,13 @@ if [ "$n_FLAG" = "n" ]; then
 
 	run_hook POST_BRINGOVER
 
-	#
-	# Possible transition from pre-split workspace to split
-	# workspace.  See if the bringover changed anything.
-	#
-	CLOSED_IS_PRESENT="$orig_closed_is_present"
 	check_closed_tree
 
 else
 	echo "\n==== No bringover to $CODEMGR_WS ====\n" >> $LOGFILE
 fi
 
-if [[ "$O_FLAG" = y && "$CLOSED_IS_PRESENT" != "yes" ]]; then
+if [[ "$O_FLAG" = y ]]; then
 	build_ok=n
 	echo "OpenSolaris binary deliverables need usr/closed." \
 	    | tee -a "$mail_msg_file" >> $LOGFILE
@@ -2622,7 +2439,6 @@ fi
 
 if [ "$SO_FLAG" = "y" -a "$build_ok" = y ]; then
 	SRC=$OPEN_SRCDIR/usr/src
-	export CLOSED_IS_PRESENT=no
 fi
 
 if is_source_build && [ $build_ok = y ] ; then
diff --git a/usr/src/tools/scripts/ws.sh b/usr/src/tools/scripts/ws.sh
index 7f9f36a7cc..3d9084c428 100644
--- a/usr/src/tools/scripts/ws.sh
+++ b/usr/src/tools/scripts/ws.sh
@@ -365,14 +365,6 @@ fi
 
 osbld_flag=0
 
-if [[ ! -v CLOSED_IS_PRESENT ]]; then
-        if [[ -d $SRC/../closed ]]; then
-                export CLOSED_IS_PRESENT="yes"
-        else
-                export CLOSED_IS_PRESENT="no"
-        fi
-fi
-
 if [[ -z "$ONBLD_DIR" ]]; then
 	ONBLD_DIR=$(/bin/dirname $(whence $0))
 fi
diff --git a/usr/src/uts/Makefile b/usr/src/uts/Makefile
index 47ada80eb4..17e4999086 100644
--- a/usr/src/uts/Makefile
+++ b/usr/src/uts/Makefile
@@ -160,10 +160,6 @@ COMMON_HDRDIRS= common/avs \
 		common/vm
 
 
-# These aren't the only headers in closed.  But the other directories
-# are simple enough that they can be driven from the src tree.
-$(CLOSED_BUILD)COMMON_HDRDIRS += $(CLOSED)/uts/common/sys
-
 #
 # Subset of COMMON_HDRDIRS in which at least one header is generated
 # at runtime (e.g., rpcgen), and in which "make clean" should run.
@@ -218,16 +214,8 @@ clean.lint modlist: $($(MACH)_ARCHITECTURES)
 # the user will be interested in), it's historically been set to
 # mirror the $(XRDIRS) list, and that works kinda sorta okay.
 #
-# We need to manually prune usr/closed/uts/{i86xpv|sfmmu|i86pc} since
-# none of them exist.
-#
-SHARED_XRDIRS = $(sparc_ARCHITECTURES) $(i386_ARCHITECTURES) sun4 sfmmu	\
+XRDIRS = $(sparc_ARCHITECTURES) $(i386_ARCHITECTURES) sun4 sfmmu	\
 	sun common
-CLOSED_XRDIRS = $(SHARED_XRDIRS:%=% ../../closed/uts/%)
-XRDIRS = $(SHARED_XRDIRS)
-CLOSED_XRDIRS_XEN = $(CLOSED_XRDIRS:../../closed/uts/i86xpv=)
-CLOSED_XRDIRS_1 = $(CLOSED_XRDIRS_XEN:../../closed/uts/i86pc=)
-$(CLOSED_BUILD)XRDIRS = $(CLOSED_XRDIRS_1:../../closed/uts/sfmmu=)
 
 XRINCDIRS = $(XRDIRS)
 
diff --git a/usr/src/uts/Makefile.uts b/usr/src/uts/Makefile.uts
index 2753b3a54c..ae53983d07 100644
--- a/usr/src/uts/Makefile.uts
+++ b/usr/src/uts/Makefile.uts
@@ -588,11 +588,6 @@ include $(SRC)/Makefile.psm
 #	while the replacement of the SUNW,SPARCstation-10,SX directory by
 #	a symbolic link is being propagated.
 #
-# IMPORTANT:: if you change any of these INS.mumble rules, then you MUST also
-# change the corresponding override definitions in $CLOSED/Makefile.tonic.
-# If you do not do this, then the closedbins build for the OpenSolaris
-# community will break. PS, the gatekeepers will be upset too.
-#
 INS.slink1= $(RM) -r $@; $(SYMLINK) $(PLATFORM) $@
 INS.slink2= $(RM) -r $@; $(SYMLINK) ../$(PLATFORM)/$(@F) $@
 INS.slink3= $(RM) -r $@; $(SYMLINK) $(IMPLEMENTED_PLATFORM) $@
@@ -631,10 +626,6 @@ KMODS = $(GENUNIX_KMODS) $(PARALLEL_KMODS)
 
 $(PARALLEL_KMODS): $(GENUNIX_KMODS)
 
-$(CLOSED_BUILD)CLOSED_KMODS = $(CLOSED_DRV_KMODS) $(CLOSED_TOD_KMODS) \
-	$(CLOSED_MISC_KMODS) $(CLOSED_CPU_KMODS) \
-	$(CLOSED_NLMISC_KMODS) $(CLOSED_DRV_KMODS_$(CLASS))
-
 LINT_KMODS = $(DRV_KMODS) $(EXEC_KMODS) $(FS_KMODS) $(SCHED_KMODS) \
 	  $(TOD_KMODS) $(STRMOD_KMODS) $(SYS_KMODS) $(MISC_KMODS) \
 	  $(MACH_KMODS) $(GSS_KMODS) $(DACF_KMODS) $(IPP_KMODS) \
@@ -642,9 +633,6 @@ LINT_KMODS = $(DRV_KMODS) $(EXEC_KMODS) $(FS_KMODS) $(SCHED_KMODS) \
 	  $(DRV_KMODS_$(CLASS)) $(MISC_KMODS_$(CLASS)) $(MAC_KMODS) \
 	  $(BRAND_KMODS) $(KICONV_KMODS) $(SOCKET_KMODS)
 
-$(CLOSED_BUILD)CLOSED_LINT_KMODS = $(CLOSED_DRV_KMODS) $(CLOSED_TOD_KMODS) \
-	  $(CLOSED_MISC_KMODS) $(CLOSED_DRV_KMODS_$(CLASS))
-
 THIS_YEAR:sh=	/bin/date +%Y
 $(OBJS_DIR)/logsubr.o	:= CPPFLAGS += -DTHIS_YEAR=$(THIS_YEAR)
 $(OBJS_DIR)/logsubr.ln	:= CPPFLAGS += -DTHIS_YEAR=$(THIS_YEAR)
diff --git a/usr/src/uts/common/nfs/Makefile b/usr/src/uts/common/nfs/Makefile
index fcfac9a0db..a40eaa9939 100644
--- a/usr/src/uts/common/nfs/Makefile
+++ b/usr/src/uts/common/nfs/Makefile
@@ -35,23 +35,15 @@ HDRS=	export.h	lm.h						\
 	nfs4_kprot.h	nfs4_db_impl.h	nfs4_idmap_impl.h \
 	nfsid_map.h	auth.h		nfs_cmd.h
 
-$(CLOSED_BUILD)CLOSEDHDRS=	lm_impl.h	lm_nlm.h	lm_server.h
-
-ALLHDRS= $(HDRS) $(CLOSEDHDRS)
-
 ROOTDIRS= $(ROOT)/usr/include/nfs
 
-ROOTHDRS= $(ALLHDRS:%=$(ROOTDIRS)/%)
+ROOTHDRS= $(HDRS:%=$(ROOTDIRS)/%)
 
-CHECKHDRS= $(HDRS:%.h=%.check) \
-	$(CLOSEDHDRS:%.h=$(CLOSED)/uts/common/nfs/%.check)
+CHECKHDRS= $(HDRS:%.h=%.check)
 
 $(ROOTDIRS)/%: %
 	$(INS.file)
 
-$(ROOTDIRS)/%: $(CLOSED)/uts/common/nfs/%
-	$(INS.file)
-
 .KEEP_STATE:
 
 .PARALLEL: $(CHECKHDRS)
diff --git a/usr/src/uts/i86pc/Makefile b/usr/src/uts/i86pc/Makefile
index 6dba4f5732..64ac810047 100644
--- a/usr/src/uts/i86pc/Makefile
+++ b/usr/src/uts/i86pc/Makefile
@@ -43,7 +43,6 @@ INTEL_LINTS	 = genunix
 LINT_LIBS	 = \
 		   $(GENUNIX_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
 		   $(PARALLEL_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
-		   $(CLOSED_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
 		   $(INTEL_LINTS:%=$(INTEL_LIB_DIR)/llib-l%.ln)
 
 I86PC_LINTS =	dr drmach_acpi
@@ -67,8 +66,7 @@ check		:=	TARGET= check
 
 .KEEP_STATE:
 
-.PARALLEL:	$(PARALLEL_KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) \
-		modlist modlist.intel
+.PARALLEL:	$(PARALLEL_KMODS) $(XMODS) modlist modlist.intel
 
 INITIAL_TARGETS = \
 	genassym \
@@ -76,17 +74,16 @@ INITIAL_TARGETS = \
 	cpu/scripts
 
 def all clean clobber clean.lint: setup genassym unix .WAIT \
-	$(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) $(IMPLEMENTATIONS)
+	$(KMODS) $(XMODS) $(IMPLEMENTATIONS)
 
 install: install_platforms setup genassym unix .WAIT \
-	$(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) $(IMPLEMENTATIONS)
+	$(KMODS) $(XMODS) $(IMPLEMENTATIONS)
 
 # Need to clean in here too because of lint.
 clean: $(I86PC_LINTS)
 
 # list the modules under i86pc.
-modlist: unix $(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) \
-	$(IMPLEMENTATIONS)
+modlist: unix $(KMODS) $(XMODS) $(IMPLEMENTATIONS)
 
 # list the modules for Install -k i86pc.
 modlist.karch: modlist modlist.intel
@@ -96,7 +93,7 @@ modlist.intel:
 
 lintlib:	unix
 
-modlintlib:	$(KMODS) $(CLOSED_KMODS)
+modlintlib:	$(KMODS)
 
 genassym unix $(KMODS):	FRC
 	@cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
@@ -114,17 +111,6 @@ $(XMODS):	FRC
 		true; \
 	fi
 
-$(CLOSED_KMODS):	FRC
-	cd $(CLOSED)/uts/i86pc/$@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
-
-$(CLOSED_XMODS):	FRC
-	@if [ -f $(CLOSED)/uts/i86pc/$@/Makefile  ]; then \
-		cd $(CLOSED)/uts/i86pc/$@; pwd; \
-		    $(MAKE) $(NO_STATE) $(TARGET); \
-	else \
-		true; \
-	fi
-
 install_h check:	$(IMPLEMENTATIONS) FRC
 	@cd sys; pwd; $(MAKE) $(TARGET)
 
@@ -168,8 +154,7 @@ include ../Makefile.targ
 # Cross-reference customization: build a cross-reference over all of the
 # i86pc-related directories.
 #
-XRDIRS		= ../i86pc ../intel ../common
-$(CLOSED_BUILD)XRDIRS	+= ../../../closed/uts/intel ../../../closed/uts/common
+XRDIRS	= ../i86pc ../intel ../common
 
 XRPRUNE	= sun4u sun4
 
diff --git a/usr/src/uts/i86pc/Makefile.i86pc.shared b/usr/src/uts/i86pc/Makefile.i86pc.shared
index 408a2a8b09..f8c63c2763 100644
--- a/usr/src/uts/i86pc/Makefile.i86pc.shared
+++ b/usr/src/uts/i86pc/Makefile.i86pc.shared
@@ -282,12 +282,6 @@ CPU_KMODS	+= authenticamd
 CPU_KMODS	+= genuineintel
 
 #
-# Don't build some of these for OpenSolaris, since they will be
-# replaced by binaries that are signed by Sun Release Engineering.
-#
-$(CLOSED_BUILD)CLOSED_CPU_KMODS	+= intel_nhmex
-
-#
 #	Exec Class Modules (/kernel/exec):
 #
 EXEC_KMODS	+=
diff --git a/usr/src/uts/i86xpv/Makefile b/usr/src/uts/i86xpv/Makefile
index 4586d8c659..7d3866b4ee 100644
--- a/usr/src/uts/i86xpv/Makefile
+++ b/usr/src/uts/i86xpv/Makefile
@@ -45,7 +45,6 @@ INTEL_LINTS	 = genunix
 LINT_LIBS	 = \
 		   $(GENUNIX_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
 		   $(PARALLEL_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
-		   $(CLOSED_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
 		   $(INTEL_LINTS:%=$(INTEL_LIB_DIR)/llib-l%.ln)
 
 I86XPV_LINTS =	xdb xnb xnbe xnbo xnbu xpvtap
@@ -68,8 +67,7 @@ check		:=	TARGET= check
 
 .KEEP_STATE:
 
-.PARALLEL:	$(PARALLEL_KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) \
-		modlist modlist.intel
+.PARALLEL:	$(PARALLEL_KMODS) $(XMODS) modlist modlist.intel
 
 INITIAL_TARGETS = \
 	genassym \
@@ -77,16 +75,16 @@ INITIAL_TARGETS = \
 	cpu/scripts
 
 def all clean clobber clean.lint: setup genassym unix .WAIT \
-	$(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS)
+	$(KMODS) $(XMODS)
 
 install: install_platforms setup genassym unix .WAIT \
-	$(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS)
+	$(KMODS) $(XMODS)
 
 # Need to clean in here too because of lint.
 clean: $(I86XPV_LINTS)
 
 # list the modules under i86xpv.
-modlist: unix $(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS)
+modlist: unix $(KMODS) $(XMODS)
 
 # list the modules for Install -k i86xpv.
 modlist.karch: modlist modlist.intel
@@ -96,7 +94,7 @@ modlist.intel:
 
 lintlib:	unix
 
-modlintlib:	$(KMODS) $(CLOSED_KMODS)
+modlintlib:	$(KMODS)
 
 genassym unix $(KMODS):	FRC
 	@cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
@@ -111,17 +109,6 @@ $(XMODS):	FRC
 		true; \
 	fi
 
-$(CLOSED_KMODS):	FRC
-	cd $(CLOSED)/uts/i86xpv/$@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
-
-$(CLOSED_XMODS):	FRC
-	@if [ -f $(CLOSED)/uts/i86xpv/$@/Makefile  ]; then \
-		cd $(CLOSED)/uts/i86xpv/$@; pwd; \
-		    $(MAKE) $(NO_STATE) $(TARGET); \
-	else \
-		true; \
-	fi
-
 install_h check:	FRC
 	@cd sys; pwd; $(MAKE) $(TARGET)
 
@@ -166,11 +153,7 @@ include ../Makefile.targ
 # Cross-reference customization: build a cross-reference over all of the
 # i86pc-related directories.
 #
-SHARED_XRDIRS	= ../i86xpv ../i86pc ../intel ../common
-XRDIRS		= $(SHARED_XRDIRS)
-CLOSED_XRDIRS1	= $(SHARED_XRDIRS:../%=../% ../../../closed/uts/%)
-CLOSED_XRDIRS2	= $(CLOSED_XRDIRS1:../../../closed/uts/i86pc=)
-$(CLOSED_BUILD)XRDIRS	= $(CLOSED_XRDIRS2:../../../closed/uts/i86xpv=)
+XRDIRS	= ../i86xpv ../i86pc ../intel ../common
 XRPRUNE	= sun4v sun4u sun4 sfmmu sparc
 
 cscope.out tags: FRC
diff --git a/usr/src/uts/intel/Makefile b/usr/src/uts/intel/Makefile
index 46b2368ec9..72b2d89989 100644
--- a/usr/src/uts/intel/Makefile
+++ b/usr/src/uts/intel/Makefile
@@ -33,15 +33,7 @@ LINT_KMODS_X1	= $(LINT_KMODS:nsmb=)
 LINT_KMODS_X2	= $(LINT_KMODS_X1:smbfs=)
 LINT_KMODLIBS	= $(LINT_KMODS_X2:e1000g=)
 LINT_LIBS	= $(LINT_LIB) $(GEN_LINT_LIB) \
-		  $(LINT_KMODLIBS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
-		  $(CLOSED_LINT_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) 
-
-$(CLOSED_BUILD)LINT_LIBS	+= $(SVVS_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln)
-$(CLOSED_BUILD)LINT_CLOSED_XMOD4	= $(CLOSED_XMODS:bnx=)
-$(CLOSED_BUILD)LINT_CLOSED_XMOD3	= $(LINT_CLOSED_XMOD4:bnxe=)
-$(CLOSED_BUILD)LINT_CLOSED_XMOD2	= $(LINT_CLOSED_XMOD3:lsimega=)
-$(CLOSED_BUILD)LINT_CLOSED_XMOD1	= $(LINT_CLOSED_XMOD2:adpu320=)
-$(CLOSED_BUILD)LINT_LIBS	+= $(LINT_XMODLIBS:%=$(LINT_LIB_DIR)/llib-l%.ln)
+		  $(LINT_KMODLIBS:%=$(LINT_LIB_DIR)/llib-l%.ln)
 
 #
 # dprov is delivered in the SUNWcryptoint package.
@@ -70,11 +62,9 @@ install_h.prereq	:=	TARGET= install_h
 
 .KEEP_STATE:
 
-.PARALLEL:	$(PARALLEL_KMODS) $(CLOSED_KMODS) $(SVVS) $(XMODS) \
-		$(CLOSED_XMODS) config $(LINT_DEPS)
+.PARALLEL:	$(PARALLEL_KMODS) $(XMODS) config $(LINT_DEPS)
 
-def all install clean clobber modlist: $(KMODS) $(CLOSED_KMODS) \
-	$(SVVS) $(XMODS) $(CLOSED_XMODS) config
+def all install clean clobber modlist: $(KMODS) $(XMODS) config
 
 clobber: clobber.targ
 
@@ -132,15 +122,11 @@ lint.prereq: FRC
 
 genunix: $(PRIVS_C)
 
-modlintlib clean.lint: $(LINT_KMODS) $(CLOSED_LINT_KMODS) $(SVVS) \
-	$(XMODS) $(CLOSED_XMODS)
+modlintlib clean.lint: $(LINT_KMODS) $(XMODS)
 
 $(KMODS) $(SUBDIRS) config:	FRC
 	@cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 
-$(CLOSED_KMODS):	FRC
-	cd $(CLOSED)/uts/intel/$@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
-
 $(XMODS):	FRC
 	@if [ -f $@/Makefile  ]; then \
 		cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET); \
@@ -148,14 +134,6 @@ $(XMODS):	FRC
 		true; \
 	fi
 
-$(SVVS) $(CLOSED_XMODS):	FRC
-	@if [ -f $(CLOSED)/uts/intel/$@/Makefile  ]; then \
-		cd $(CLOSED)/uts/intel/$@; pwd; \
-		    $(MAKE) $(NO_STATE) $(TARGET); \
-	else \
-		true; \
-	fi
-
 install_h check:	FRC
 	@cd sys; pwd; $(MAKE) $(TARGET)
 	@cd asm; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/uts/intel/Makefile.files b/usr/src/uts/intel/Makefile.files
index 082c4eefb3..01147a5314 100644
--- a/usr/src/uts/intel/Makefile.files
+++ b/usr/src/uts/intel/Makefile.files
@@ -287,3 +287,24 @@ MCAMD_OBJS	+= \
 	mcamd_dimmcfg.o \
 	mcamd_subr.o \
 	mcamd_pcicfg.o
+
+#
+# Intel Nehalem memory controller module
+#
+INTEL_NHM_OBJS += \
+	nhm_init.o \
+	mem_addr.o \
+	intel_nhmdrv.o \
+	nhm_pci_cfg.o \
+	dimm_topo.o \
+	intel_nhm.o
+
+#
+# Intel 5000/5100/5400/7300 chipset memory controller hub (MCH) module
+#
+INTEL_NB5000_OBJS += \
+	intel_nb5000.o \
+	intel_nbdrv.o \
+	dimm_addr.o \
+	nb_pci_cfg.o \
+	nb5000_init.o
diff --git a/usr/src/uts/intel/Makefile.intel.shared b/usr/src/uts/intel/Makefile.intel.shared
index b86fb0a65a..a713e67480 100644
--- a/usr/src/uts/intel/Makefile.intel.shared
+++ b/usr/src/uts/intel/Makefile.intel.shared
@@ -368,17 +368,6 @@ DRV_KMODS	+= ncall nsctl sdbc nskern sv
 DRV_KMODS	+= ii rdc rdcsrv rdcstub 
 DRV_KMODS	+= iptun
 
-$(CLOSED_BUILD)CLOSED_DRV_KMODS		+= bmc
-$(CLOSED_BUILD)CLOSED_DRV_KMODS		+= glm
-$(CLOSED_BUILD)CLOSED_DRV_KMODS		+= intel_nhmex
-$(CLOSED_BUILD)CLOSED_DRV_KMODS		+= cpqary3
-$(CLOSED_BUILD)CLOSED_DRV_KMODS		+= marvell88sx
-$(CLOSED_BUILD)CLOSED_DRV_KMODS		+= bcm_sata
-$(CLOSED_BUILD)CLOSED_DRV_KMODS		+= memtest
-$(CLOSED_BUILD)CLOSED_DRV_KMODS		+= mpt
-$(CLOSED_BUILD)CLOSED_DRV_KMODS		+= atiatom
-$(CLOSED_BUILD)CLOSED_DRV_KMODS		+= acpi_toshiba
-
 #
 # Common code drivers
 #
@@ -403,7 +392,6 @@ DRV_KMODS	+= ipmi
 DRV_KMODS	+= iprb
 DRV_KMODS	+= ixgbe
 DRV_KMODS	+= vr
-$(CLOSED_BUILD)CLOSED_DRV_KMODS	+= ixgb
 
 #
 # Virtio drivers
@@ -488,8 +476,6 @@ DRV_KMODS	+= wusb_df
 DRV_KMODS	+= wusb_ca
 DRV_KMODS	+= usbecm
 
-$(CLOSED_BUILD)CLOSED_DRV_KMODS	+= usbser_edge
-
 #
 #	1394 modules
 #
@@ -654,10 +640,6 @@ MISC_KMODS	+= uwba
 
 MISC_KMODS	+= klmmod klmops
 
-$(CLOSED_BUILD)CLOSED_MISC_KMODS	+= scsi_vhci_f_asym_lsi
-$(CLOSED_BUILD)CLOSED_MISC_KMODS	+= scsi_vhci_f_asym_emc
-$(CLOSED_BUILD)CLOSED_MISC_KMODS	+= scsi_vhci_f_sym_emc
-
 #
 #	Software Cryptographic Providers (/kernel/crypto):
 #
@@ -689,26 +671,8 @@ IPP_KMODS	+= tswtclmt
 GENUNIX_KMODS	+= genunix
 
 #
-#	SVVS Testing Modules (/kernel/strmod):
-#
-#	These are streams and driver modules which are not to be
-#	delivered with a released system. However, during development
-#	it is convenient to build and install the SVVS kernel modules.
-#
-SVVS_KMODS	+= lmodb lmode lmodr lmodt svvslo tidg tivc tmux
-
-$(CLOSED_BUILD)SVVS		+= svvs
-
-#
 #	Modules eXcluded from the product:
 #
-$(CLOSED_BUILD)CLOSED_XMODS =		\
-	adpu320		\
-	bnx		\
-	bnxe		\
-	lsimega		\
-	sdpib
-
 
 #
 #	'Dacf' Modules (/kernel/dacf):
diff --git a/usr/src/uts/intel/intel_nb5000/Makefile b/usr/src/uts/intel/intel_nb5000/Makefile
index ec9092d791..55ee9be813 100644
--- a/usr/src/uts/intel/intel_nb5000/Makefile
+++ b/usr/src/uts/intel/intel_nb5000/Makefile
@@ -30,7 +30,6 @@
 #	Path to the base of the uts directory tree (usually /usr/src/uts).
 #
 UTSBASE = ../..
-UTSCLOSED = ../../../../closed/uts
 
 #
 #       Define the module and object file sets.
@@ -46,20 +45,6 @@ CONF_SRCDIR	= $(UTSBASE)/intel/io/intel_nb5000
 #
 include ../Makefile.intel
 
-#
-# The list of object files is defined here, rather than in Makefile.files,
-# because the "$(CLOSED_BUILD)" macro has not been defined at the time
-# Makefile.files is processed.
-#
-INTEL_NB5000_OBJS += \
-	intel_nb5000.o \
-	intel_nbdrv.o \
-	dimm_addr.o \
-	nb_pci_cfg.o \
-	nb5000_init.o
-
-$(CLOSED_BUILD)INTEL_NB5000_OBJS += memtrans.o
-
 OBJECTS		= $(INTEL_NB5000_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(INTEL_NB5000_OBJS:%.o=$(LINTS_DIR)/%.ln)
 
@@ -105,4 +90,3 @@ $(OBJECTS): $(OBJS_DIR) $(MCAMD_OFF_H)
 #       Include common targets.
 #
 include ../Makefile.targ
-$(CLOSED_BUILD)include $(UTSCLOSED)/intel/Makefile.rules
diff --git a/usr/src/uts/intel/intel_nhm/Makefile b/usr/src/uts/intel/intel_nhm/Makefile
index cc21adac2a..73e594c92f 100644
--- a/usr/src/uts/intel/intel_nhm/Makefile
+++ b/usr/src/uts/intel/intel_nhm/Makefile
@@ -29,7 +29,6 @@
 #	Path to the base of the uts directory tree (usually /usr/src/uts).
 #
 UTSBASE = ../..
-UTSCLOSED = ../../../../closed/uts
 
 #
 #       Define the module and object file sets.
@@ -44,22 +43,6 @@ CONF_SRCDIR	= $(UTSBASE)/intel/io/intel_nhm
 #
 include $(UTSBASE)/intel/Makefile.intel
 
-#
-# The list of object files is defined here, rather than in Makefile.files,
-# because the "$(CLOSED_BUILD)" macro has not been defined at the time
-# Makefile.files is processed.
-#
-INTEL_NHM_OBJS += \
-	nhm_init.o \
-	mem_addr.o \
-	intel_nhmdrv.o \
-	nhm_pci_cfg.o \
-	dimm_topo.o \
-	intel_nhm.o
-
-$(CLOSED_BUILD)INTEL_NHM_OBJS += \
-	nhm_dimm_addr.o
-
 OBJECTS		= $(INTEL_NHM_OBJS:%=$(OBJS_DIR)/%)
 LINTS           = $(INTEL_NHM_OBJS:%.o=$(LINTS_DIR)/%.ln)
 
@@ -100,4 +83,3 @@ install:        $(INSTALL_DEPS)
 #       Include common targets.
 #
 include ../Makefile.targ
-$(CLOSED_BUILD)include $(UTSCLOSED)/intel/Makefile.rules
diff --git a/usr/src/uts/intel/sd/Makefile b/usr/src/uts/intel/sd/Makefile
index bac6d94908..42af2b7225 100644
--- a/usr/src/uts/intel/sd/Makefile
+++ b/usr/src/uts/intel/sd/Makefile
@@ -138,7 +138,6 @@ SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
 CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll)
 
 WARLOCK_TARGETS = warlock_alone
-$(CLOSED_BUILD)WARLOCK_TARGETS += warlock_with_mpt warlock_with_glm
 
 warlock: $(WARLOCK_TARGETS)
 
@@ -154,28 +153,6 @@ $(WARLOCK_OK):	$(WLCMD_DIR)/sd.wlcmd $(WARLOCK_OUT) scsi_files \
 %.ll: $(UTSBASE)/common/io/scsi/targets/%.c
 	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
 
-warlock_with_glm: $(WLCMD_DIR)/sd_with_glm.wlcmd $(WARLOCK_OUT) scsi_files \
-	glm_files warlock_ddi.files cmlb_files
-	$(WARLOCK) -c $(WLCMD_DIR)/sd_with_glm.wlcmd \
-		$(WARLOCK_OUT) \
-		$(CLOSED)/uts/intel/glm/*.ll \
-		 $(SCSI_FILES) $(CMLB_FILES) \
-		-l ../warlock/ddi_dki_impl.ll
-
-warlock_with_mpt: $(WLCMD_DIR)/sd_with_mpt.wlcmd $(WARLOCK_OUT) scsi_files \
-	mpt_files warlock_ddi.files cmlb_files
-	$(WARLOCK) -c $(WLCMD_DIR)/sd_with_mpt.wlcmd \
-		$(WARLOCK_OUT) \
-		$(CLOSED)/uts/intel/mpt/*.ll \
-		$(SCSI_FILES) $(CMLB_FILES) \
-		-l ../warlock/ddi_dki_impl.ll
-
-glm_files:
-	@cd $(CLOSED)/uts/intel/glm; pwd; $(MAKE) warlock
-
-mpt_files:
-	@cd $(CLOSED)/uts/intel/mpt; pwd; $(MAKE) warlock
-
 cmlb_files:
 	@cd ../cmlb; pwd; $(MAKE) warlock
 
diff --git a/usr/src/uts/intel/ses/Makefile b/usr/src/uts/intel/ses/Makefile
index 0e51fd521e..f1b4243862 100644
--- a/usr/src/uts/intel/ses/Makefile
+++ b/usr/src/uts/intel/ses/Makefile
@@ -117,7 +117,6 @@ TEST		= test
 SCSI_FILES	= $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
 
 WARLOCK_TARGETS	= $(WARLOCK_OK)
-$(CLOSED_BUILD)WARLOCK_TARGETS += warlock_with_glm
 
 warlock: $(WARLOCK_TARGETS)
 
@@ -135,19 +134,6 @@ $(WARLOCK_OK): $(WLCMD_DIR)/$(MODULE).wlcmd $(WARLOCK_OUT)
 %.ll: $(UTSBASE)/common/io/scsi/targets/%.c
 	$(WLCC) $(CPPFLAGS) -o $@ $<
 
-warlock_with_glm: $(WLCMD_DIR)/ses_with_glm.wlcmd $(WARLOCK_OUT) glm_files
-	@cd ../warlock; $(MAKE) warlock
-	@cd ../scsi; $(MAKE) warlock
-	@cd $(CLOSED)/uts/intel/glm; $(MAKE) warlock;
-	$(WARLOCK) -c $(WLCMD_DIR)/ses_with_glm.wlcmd ses.ll \
-		$(CLOSED)/uts/intel/glm/*.ll \
-	        $(SCSI_FILES) \
-		../warlock/scsi.ll \
-		-l ../warlock/ddi_dki_impl.ll 
-
-glm_files:
-	@cd $(CLOSED)/uts/intel/glm; pwd; $(MAKE) warlock
-
 warlock_ddi.files:
 	@cd ../warlock; pwd; $(MAKE) warlock
 
diff --git a/usr/src/uts/intel/st/Makefile b/usr/src/uts/intel/st/Makefile
index f629f4b70a..078d5a3796 100644
--- a/usr/src/uts/intel/st/Makefile
+++ b/usr/src/uts/intel/st/Makefile
@@ -126,7 +126,6 @@ TEST		= test
 SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
 
 WARLOCK_TARGETS = warlock_alone
-$(CLOSED_BUILD)WARLOCK_TARGETS += warlock_with_glm
 
 warlock: $(WARLOCK_TARGETS)
 
@@ -144,14 +143,6 @@ $(WARLOCK_OK): 	$(WLCMD_DIR)/st.wlcmd $(WARLOCK_OUT) scsi_files \
 %.ll: $(UTSBASE)/common/io/scsi/targets/%.c
 	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
 
-warlock_with_glm: $(WLCMD_DIR)/st_with_glm.wlcmd $(WARLOCK_OUT) scsi_files \
-	glm_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/st_with_glm.wlcmd \
-		$(WARLOCK_OUT) $(CLOSED)/uts/intel/glm/glm $(SCSI_FILES) \
-		-l ../warlock/ddi_dki_impl.ll
-glm_files:
-	@cd $(CLOSED)/uts/intel/glm; pwd; $(MAKE) warlock
-
 warlock_ddi.files:
 	@cd ../warlock; pwd; $(MAKE) warlock
 
diff --git a/usr/src/uts/intel/sys/Makefile b/usr/src/uts/intel/sys/Makefile
index d05dead3f6..192ada41a5 100644
--- a/usr/src/uts/intel/sys/Makefile
+++ b/usr/src/uts/intel/sys/Makefile
@@ -90,9 +90,6 @@ HDRS	=			\
 	x86_archext.h		\
 	xen_errno.h
 
-CLOSEDHDRS = \
-	memtest.h
-
 ROOTDIR=	$(ROOT)/usr/include/sys
 SCSIDIR=	$(ROOTDIR)/scsi
 SCSIDIRS=	$(SCSIDIR) $(SCSIDIR)/conf $(SCSIDIR)/generic \
@@ -101,20 +98,14 @@ ROOTFSDIR=	$(ROOTDIR)/fs
 ROOTDIRS=	$(ROOTDIR) $(ROOTFSDIR)
 
 ROOTHDRS= $(HDRS:%=$(ROOTDIR)/%)
-$(CLOSED_BUILD)ROOTHDRS += $(CLOSEDHDRS:%=$(ROOTDIR)/%)
 
 CHECKHDRS= 			\
 	$(HDRS:%.h=%.check)
 
-$(CLOSED_BUILD)CHECKHDRS += $(CLOSEDHDRS:%.h=$(CLOSED)/uts/intel/sys/%.check)
-
 # install rules
 $(ROOTDIR)/%: %
 	$(INS.file)
 
-$(ROOTDIR)/%:	$(CLOSED)/uts/intel/sys/%
-	$(INS.file)
-
 .KEEP_STATE:
 
 .PARALLEL: $(CHECKHDRS) $(ROOTHDRS)
diff --git a/usr/src/uts/intel/warlock/Makefile b/usr/src/uts/intel/warlock/Makefile
index 461a60bdf3..b109499204 100644
--- a/usr/src/uts/intel/warlock/Makefile
+++ b/usr/src/uts/intel/warlock/Makefile
@@ -81,16 +81,11 @@ warlock.usb:
 	@cd ../usbsacm; $(MAKE) clean; $(MAKE) warlock
 	@cd ../usbecm; $(MAKE) clean; $(MAKE) warlock
 	@cd ../usbskel; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/intel/usbser_edge; \
-		$(MAKE) clean; $(MAKE) warlock
 
 warlock.scsi:
 	@cd ../sd; $(MAKE) clean; $(MAKE) warlock
 	@cd ../ses; $(MAKE) clean; $(MAKE) warlock
 	@cd ../st; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/intel/glm; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/intel/mpt; $(MAKE) clean; $(MAKE) warlock
-
 
 warlock.1394:
 	@cd ../s1394; $(MAKE) clean; $(MAKE) warlock
@@ -107,17 +102,12 @@ warlock.ib:
 	@cd ../ibtl; $(MAKE) clean; $(MAKE) warlock
 	@cd ../ibcm; $(MAKE) clean; $(MAKE) warlock
 	@cd ../ibd; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/intel/tavor; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/intel/hermon; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/intel/daplt; $(MAKE) clean; $(MAKE) warlock
 
 warlock.sata:
 	@cd ../sata; $(MAKE) clean; $(MAKE) warlock
 	@cd ../si3124; $(MAKE) clean; $(MAKE) warlock
 	@cd ../nv_sata; $(MAKE) clean; $(MAKE) warlock
 	@cd ../ahci; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/intel/marvell88sx; \
-		$(MAKE) clean; $(MAKE) warlock
 
 warlock.wc:
 	@cd ../wc; $(MAKE) clean; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/Makefile b/usr/src/uts/sparc/Makefile
index 30da3d38e2..4bbdc7cf57 100644
--- a/usr/src/uts/sparc/Makefile
+++ b/usr/src/uts/sparc/Makefile
@@ -37,13 +37,8 @@ LINT_KMODS_X1	= $(LINT_KMODS:nsmb=)
 LINT_KMODS_X2	= $(LINT_KMODS_X1:smbfs=)
 LINT_KMODLIBS	= $(LINT_KMODS_X2:e1000g=)
 LINT_LIBS	= $(LINT_LIB) $(GEN_LINT_LIB) \
-		  $(LINT_KMODLIBS:%=$(LINT_LIB_DIR)/llib-l%.ln)
-
-$(CLOSED_BUILD)LINT_LIBS += $(CLOSED_LINT_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln)
-
-$(CLOSED_BUILD)LINT_LIBS	+= $(SVVS_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln)
-LINT_LIBS	+= $(LINT_XMODLIBS:%=$(LINT_LIB_DIR)/llib-l%.ln)
-$(CLOSED_BUILD)LINT_LIBS += $(CLOSED_XMODS:%=$(LINT_LIB_DIR)/llib-l%.ln)
+		  $(LINT_KMODLIBS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
+		  $(LINT_XMODLIBS:%=$(LINT_LIB_DIR)/llib-l%.ln)
 
 DRV_KMODS	+= dprov
 
@@ -62,21 +57,15 @@ install_h	:=	TARGET= install_h
 
 .KEEP_STATE:
 
-.PARALLEL:	$(PARALLEL_KMODS) $(CLOSED_KMODS) $(SVVS) $(XMODS) \
-		$(CLOSED_XMODS) config $(LINT_DEPS)
+.PARALLEL:	$(PARALLEL_KMODS) $(XMODS) config $(LINT_DEPS)
 
-def all install clean clobber modlist: $(KMODS) $(CLOSED_KMODS) $(SVVS) \
-	$(XMODS) $(CLOSED_XMODS) config
+def all install clean clobber modlist: $(KMODS) $(XMODS) config
 
-modlintlib clean.lint: $(LINT_KMODS) $(CLOSED_LINT_KMODS) $(SVVS) \
-	$(XMODS) $(CLOSED_XMODS)
+modlintlib clean.lint: $(LINT_KMODS) $(XMODS)
 
 $(KMODS) config:	FRC
 	@cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 
-$(CLOSED_KMODS):	FRC
-	cd $(CLOSED)/uts/sparc/$@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
-
 $(XMODS):	FRC
 	@if [ -f $@/Makefile  ]; then \
 		cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET); \
@@ -84,14 +73,6 @@ $(XMODS):	FRC
 		true; \
 	fi
 
-$(SVVS) $(CLOSED_XMODS):	FRC
-	@if [ -f $(CLOSED)/uts/sparc/$@/Makefile  ]; then \
-		cd $(CLOSED)/uts/sparc/$@; pwd; \
-		    $(MAKE) $(NO_STATE) $(TARGET); \
-	else \
-		true; \
-	fi
-
 install_h check:	FRC
 	@cd asm; pwd; $(MAKE) $(TARGET)
 	@cd sys; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/uts/sparc/Makefile.sparc.shared b/usr/src/uts/sparc/Makefile.sparc.shared
index c49103913b..11a89cfc61 100644
--- a/usr/src/uts/sparc/Makefile.sparc.shared
+++ b/usr/src/uts/sparc/Makefile.sparc.shared
@@ -236,12 +236,6 @@ DRV_KMODS	+= bridge trill
 DRV_KMODS	+= bpf
 DRV_KMODS	+= dca
 
-$(CLOSED_BUILD)CLOSED_DRV_KMODS	+= glm
-$(CLOSED_BUILD)CLOSED_DRV_KMODS	+= isp
-$(CLOSED_BUILD)CLOSED_DRV_KMODS	+= mpt
-$(CLOSED_BUILD)CLOSED_DRV_KMODS += qus
-$(CLOSED_BUILD)CLOSED_DRV_KMODS	+= se
-
 #
 #       Hardware Drivers in common space
 #
@@ -265,7 +259,6 @@ DRV_KMODS	+= igb
 DRV_KMODS	+= ixgbe
 DRV_KMODS	+= vr
 DRV_KMODS	+= mr_sas
-$(CLOSED_BUILD)CLOSED_DRV_KMODS	+= ixgb
 DRV_KMODS	+= yge
 
 #
@@ -322,10 +315,6 @@ DRV_KMODS	+= srpt
 DRV_KMODS	+= pmcs
 DRV_KMODS	+= pmcs8001fw
 
-$(CLOSED_BUILD)CLOSED_DRV_KMODS	+= ifp
-$(CLOSED_BUILD)CLOSED_DRV_KMODS	+= uata
-$(CLOSED_BUILD)CLOSED_DRV_KMODS	+= usbser_edge
-
 #
 #	I/O framework test drivers
 #
@@ -432,10 +421,6 @@ MISC_KMODS	+= mii
 
 MISC_KMODS	+= klmmod klmops
 
-$(CLOSED_BUILD)CLOSED_MISC_KMODS	+= scsi_vhci_f_asym_lsi
-$(CLOSED_BUILD)CLOSED_MISC_KMODS	+= scsi_vhci_f_asym_emc
-$(CLOSED_BUILD)CLOSED_MISC_KMODS	+= scsi_vhci_f_sym_emc
-
 #
 #	Software Cryptographic Providers (/kernel/crypto):
 #
@@ -474,15 +459,10 @@ DACF_KMODS	+= consconfig_dacf
 #
 SVVS_KMODS	+= lmodb lmode lmodr lmodt svvslo tidg tivc tmux
 
-$(CLOSED_BUILD)SVVS		+= svvs
-
 #
 #	Modules eXcluded from the product:
 #
 XMODS		+=
-$(CLOSED_BUILD)CLOSED_XMODS =		\
-	sdpib		\
-	wsdrv
 
 #
 #	'Dacf' Modules (/kernel/dacf):
diff --git a/usr/src/uts/sparc/sd/Makefile b/usr/src/uts/sparc/sd/Makefile
index 18e6ac8f28..08d2efc031 100644
--- a/usr/src/uts/sparc/sd/Makefile
+++ b/usr/src/uts/sparc/sd/Makefile
@@ -135,8 +135,6 @@ SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
 CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll)
 
 WARLOCK_TARGETS = warlock_alone warlock_with_esp warlock_with_fas
-$(CLOSED_BUILD)WARLOCK_TARGETS += warlock_with_isp warlock_with_glm \
-	warlock_with_uata warlock_with_mpt
 
 warlock: $(WARLOCK_TARGETS)
 
@@ -166,34 +164,6 @@ warlock_with_fas: $(WLCMD_DIR)/sd_with_fas.wlcmd $(WARLOCK_OUT) scsi_files \
 		$(SCSI_FILES) $(CMLB_FILES) \
 		-l ../warlock/ddi_dki_impl.ll
 
-warlock_with_isp: $(WLCMD_DIR)/sd_with_isp.wlcmd $(WARLOCK_OUT) scsi_files \
-	isp_files warlock_ddi.files cmlb_files
-	$(WARLOCK) -c $(WLCMD_DIR)/sd_with_isp.wlcmd \
-		$(WARLOCK_OUT) $(CLOSED)/uts/sparc/isp/isp $(SCSI_FILES) \
-		$(CMLB_FILES) \
-		-l ../warlock/ddi_dki_impl.ll
-
-warlock_with_glm: $(WLCMD_DIR)/sd_with_glm.wlcmd $(WARLOCK_OUT) scsi_files \
-	glm_files warlock_ddi.files cmlb_files
-	$(WARLOCK) -c $(WLCMD_DIR)/sd_with_glm.wlcmd \
-		$(WARLOCK_OUT) $(CLOSED)/uts/sparc/glm/glm $(SCSI_FILES) \
-		$(CMLB_FILES) \
-		-l ../warlock/ddi_dki_impl.ll
-
-warlock_with_uata: $(WLCMD_DIR)/sd_with_uata.wlcmd $(WARLOCK_OUT) scsi_files \
-	uata_files warlock_ddi.files cmlb_files
-	$(WARLOCK) -c $(WLCMD_DIR)/sd_with_uata.wlcmd \
-		$(WARLOCK_OUT) $(CLOSED)/uts/sparc/uata/*.ll $(SCSI_FILES) \
-		$(CMLB_FILES) \
-		-l ../warlock/ddi_dki_impl.ll
-
-warlock_with_mpt: $(WLCMD_DIR)/sd_with_mpt.wlcmd $(WARLOCK_OUT) scsi_files \
-	mpt_files warlock_ddi.files cmlb_files
-	$(WARLOCK) -c $(WLCMD_DIR)/sd_with_mpt.wlcmd \
-		$(WARLOCK_OUT) $(CLOSED)/uts/sparc/mpt/*.ll $(SCSI_FILES)  \
-		$(CMLB_FILES) \
-		-l ../warlock/ddi_dki_impl.ll
-
 cmlb_files:
 	@cd ../cmlb; pwd; $(MAKE) warlock
 
@@ -207,17 +177,5 @@ esp_files:
 fas_files:
 	@cd ../fas; pwd; $(MAKE) warlock
 
-isp_files:
-	@cd $(CLOSED)/uts/sparc/isp; pwd; $(MAKE) warlock
-
-glm_files:
-	@cd $(CLOSED)/uts/sparc/glm; pwd; $(MAKE) warlock
-
-uata_files:
-	@cd $(CLOSED)/uts/sparc/uata; pwd; $(MAKE) warlock
-
-mpt_files:
-	@cd $(CLOSED)/uts/sparc/mpt; pwd; $(MAKE) warlock
-
 warlock_ddi.files:
 	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/ses/Makefile b/usr/src/uts/sparc/ses/Makefile
index 76d1cd762c..edc95a7b3b 100644
--- a/usr/src/uts/sparc/ses/Makefile
+++ b/usr/src/uts/sparc/ses/Makefile
@@ -118,7 +118,6 @@ SES_FILES	= $(MODULE).ll
 SCSI_FILES	= $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
 
 WARLOCK_TARGETS	= $(WARLOCK_OK) warlock_with_esp.ok warlock_with_fas.ok
-$(CLOSED_BUILD)WARLOCK_TARGETS += warlock_with_isp.ok warlock_with_glm.ok
 
 warlock: $(WARLOCK_TARGETS)
 
@@ -151,28 +150,6 @@ warlock_with_fas.ok: $(WLCMD_DIR)/ses_with_fas.wlcmd $(SES_FILES)
 	        $(SCSI_FILES)
 	@ $(TOUCH) $@
 
-warlock_with_isp.ok: $(WLCMD_DIR)/ses_with_isp.wlcmd $(SES_FILES)
-	@cd ../warlock; $(MAKE) warlock
-	@cd ../scsi; $(MAKE) warlock
-	@cd $(CLOSED)/uts/sparc/isp; $(MAKE) warlock;
-	$(WARLOCK) -c $(WLCMD_DIR)/ses_with_isp.wlcmd $(SES_FILES) \
-		$(CLOSED)/uts/sparc/isp/isp \
-	        ../warlock/scsi.ll \
-	        -l ../warlock/ddi_dki_impl.ll \
-	        $(SCSI_FILES)
-	@ $(TOUCH) $@
-
-warlock_with_glm.ok: $(WLCMD_DIR)/ses_with_glm.wlcmd $(SES_FILES)
-	@cd ../warlock; $(MAKE) warlock
-	@cd ../scsi; $(MAKE) warlock
-	@cd $(CLOSED)/uts/sparc/glm; $(MAKE) warlock;
-	$(WARLOCK) -c $(WLCMD_DIR)/ses_with_glm.wlcmd $(SES_FILES) \
-		$(CLOSED)/uts/sparc/glm/glm \
-	        ../warlock/scsi.ll \
-	        -l ../warlock/ddi_dki_impl.ll \
-	        $(SCSI_FILES)
-	@ $(TOUCH) $@
-
 %.ll: $(UTSBASE)/common/io/scsi/targets/%.c
 	$(WLCC) $(CPPFLAGS) -o $@ $<
 
diff --git a/usr/src/uts/sparc/st/Makefile b/usr/src/uts/sparc/st/Makefile
index fd24778fce..03140e9e18 100644
--- a/usr/src/uts/sparc/st/Makefile
+++ b/usr/src/uts/sparc/st/Makefile
@@ -127,7 +127,6 @@ TEST		= test
 SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
 
 WARLOCK_TARGETS =  warlock_alone warlock_with_esp warlock_with_fas
-$(CLOSED_BUILD)WARLOCK_TARGETS += warlock_with_isp warlock_with_glm
 
 warlock: $(WARLOCK_TARGETS)
 
@@ -147,18 +146,6 @@ warlock_with_fas: $(WLCMD_DIR)/st_with_fas.wlcmd $(WARLOCK_OUT) scsi_files \
 		$(SCSI_FILES)  \
 		-l ../warlock/ddi_dki_impl.ll
 
-warlock_with_isp: $(WLCMD_DIR)/st_with_isp.wlcmd $(WARLOCK_OUT) scsi_files \
-	isp_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/st_with_isp.wlcmd \
-		$(WARLOCK_OUT) $(CLOSED)/uts/sparc/isp/isp $(SCSI_FILES)  \
-		-l ../warlock/ddi_dki_impl.ll
-
-warlock_with_glm: $(WLCMD_DIR)/st_with_glm.wlcmd $(WARLOCK_OUT) scsi_files \
-	glm_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/st_with_glm.wlcmd \
-		$(WARLOCK_OUT) $(CLOSED)/uts/sparc/glm/glm $(SCSI_FILES) \
-		-l ../warlock/ddi_dki_impl.ll
-
 scsi_files:
 	@cd ../scsi; pwd; $(MAKE) warlock
 
@@ -168,12 +155,6 @@ esp_files:
 fas_files:
 	@cd ../fas; pwd; $(MAKE) warlock
 
-isp_files:
-	@cd $(CLOSED)/uts/sparc/isp; pwd; $(MAKE) warlock
-
-glm_files:
-	@cd $(CLOSED)/uts/sparc/glm; pwd; $(MAKE) warlock
-
 st.ok: $(WLCMD_DIR)/st.wlcmd st.ll st_conf.ll  scsi_files warlock_ddi.files
 	$(WARLOCK) -c $(WLCMD_DIR)/st.wlcmd $(WARLOCK_OUT) $(SCSI_FILES) \
 	-l ../warlock/ddi_dki_impl.ll
diff --git a/usr/src/uts/sparc/warlock/Makefile b/usr/src/uts/sparc/warlock/Makefile
index 8afa538c2f..3fcb2bfb7e 100644
--- a/usr/src/uts/sparc/warlock/Makefile
+++ b/usr/src/uts/sparc/warlock/Makefile
@@ -81,8 +81,6 @@ warlock.usb:
 	@cd ../usbsacm; $(MAKE) clean; $(MAKE) warlock
 	@cd ../usbecm; $(MAKE) clean; $(MAKE) warlock
 	@cd ../usbskel; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/sparc/usbser_edge; \
-		$(MAKE) clean; $(MAKE) warlock
 
 warlock.scsi:
 	@cd ../dad; $(MAKE) clean; $(MAKE) warlock
@@ -93,11 +91,6 @@ warlock.scsi:
 	@cd ../ses; $(MAKE) clean; $(MAKE) warlock
 	@cd ../st; $(MAKE) clean; $(MAKE) warlock
 	@cd ../ssd; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/sparc/uata; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/sparc/glm; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/sparc/mpt; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/sparc/ifp; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/sparc/isp; $(MAKE) clean; $(MAKE) warlock
 
 warlock.1394:
 	@cd ../s1394; $(MAKE) clean; $(MAKE) warlock
@@ -114,17 +107,12 @@ warlock.ib:
 	@cd ../ibtl; $(MAKE) clean; $(MAKE) warlock
 	@cd ../ibcm; $(MAKE) clean; $(MAKE) warlock
 	@cd ../ibd; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/sparc/tavor; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/sparc/hermon; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/sparc/daplt; $(MAKE) clean; $(MAKE) warlock
 
 warlock.sata:
 	@cd ../sata; $(MAKE) clean; $(MAKE) warlock
 	@cd ../si3124; $(MAKE) clean; $(MAKE) warlock
 	@cd ../ahci; $(MAKE) clean; $(MAKE) warlock
 	@cd ../nv_sata; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/sparc/marvell88sx; \
-		$(MAKE) clean; $(MAKE) warlock
 
 warlock.wc:
 	@cd ../wc; $(MAKE) clean; $(MAKE) warlock
diff --git a/usr/src/uts/sun/sys/Makefile b/usr/src/uts/sun/sys/Makefile
index 10d97d340e..778e8394f4 100644
--- a/usr/src/uts/sun/sys/Makefile
+++ b/usr/src/uts/sun/sys/Makefile
@@ -43,12 +43,6 @@ SCSIADHDRS= \
 fascmd.h	fasdma.h \
 fasreg.h	fasvar.h	ifpio.h		sfvar.h
 
-CLOSED_SCSIAD = $(CLOSED)/uts/sun/sys/scsi/adapters
-
-CLOSED_SCSIADHDRS= \
-ifpcmd.h	ifpmail.h	ifpreg.h	ifpvar.h \
-ispcmd.h	ispmail.h	ispreg.h	ispvar.h
-
 SCSITARGHDRS= \
 
 ROOTDIR=	$(ROOT)/usr/include/sys
@@ -58,11 +52,8 @@ ROOTDIRS=	$(ROOTDIR) \
 		$(ROOTDIR)/scsi/targets
 
 ROOTHDRS= $(HDRS:%=$(ROOTDIR)/%)
-$(CLOSED_BUILD)ROOTHDRS += $(CLOSED_HDRS:%=$(ROOTDIR)/%)
 ROOTFCHDRS= $(FCHDRS:%=$(ROOTDIR)/fc4/%)
 ROOTSCSIADHDRS= $(SCSIADHDRS:%=$(ROOTDIR)/scsi/adapters/%)
-$(CLOSED_BUILD)ROOTSCSIADHDRS += \
-	$(CLOSED_SCSIADHDRS:%=$(ROOTDIR)/scsi/adapters/%)
 ROOTSCSITARGHDRS= $(SCSITARGHDRS:%=$(ROOTDIR)/scsi/targets/%)
 
 
@@ -70,18 +61,12 @@ ROOTSCSITARGHDRS= $(SCSITARGHDRS:%=$(ROOTDIR)/scsi/targets/%)
 $(ROOTDIR)/%: %
 	$(INS.file)
 
-$(ROOTDIR)/%: $(CLOSED)/uts/sun/sys/%
-	$(INS.file)
-
 $(ROOTDIR)/audio/%: audio/%
 	$(INS.file)
 
 $(ROOTDIR)/scsi/adapters/%: scsi/adapters/%
 	$(INS.file)
 
-$(ROOTDIR)/scsi/adapters/%: $(CLOSED_SCSIAD)/%
-	$(INS.file)
-
 $(ROOTDIR)/scsi/targets/%: scsi/targets/%
 	$(INS.file)
 
@@ -102,10 +87,6 @@ CHECKHDRS= \
 	$(SCSIADHDRS:%.h=scsi/adapters/%.check) \
 	$(SCSITARGHDRS:%.h=scsi/targets/%.check)
 
-$(CLOSED_BUILD)CHECKHDRS += \
-	$(CLOSED_HDRS:%.h=$(CLOSED)/uts/sun/sys/%.check) \
-	$(CLOSED_SCSIADHDRS:%.h=$(CLOSED_SCSIAD)/%.check)
-
 # headers which won't quite meet the standards...
 #
 # devops.h has a macro where the formal parameters to the macro are greater
diff --git a/usr/src/uts/sun4u/Makefile b/usr/src/uts/sun4u/Makefile
index d08775e68e..f98f4b2eb4 100644
--- a/usr/src/uts/sun4u/Makefile
+++ b/usr/src/uts/sun4u/Makefile
@@ -46,7 +46,6 @@ SPARC_LINTS	 =
 #
 LINT_LIBS	 = $(LINT_LIB) \
 		   $(LINT_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
-		   $(CLOSED_LINT_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
 		   $(SPARC_LINTS:%=$(SPARC_LIB_DIR)/llib-l%.ln)
 
 
@@ -71,8 +70,8 @@ check		:=	TARGET= check
 
 .KEEP_STATE:
 
-.PARALLEL:	$(PARALLEL_KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) \
-		$(IMPLEMENTATIONS) $(CLOSED_IMPLEMENTATIONS) \
+.PARALLEL:	$(PARALLEL_KMODS) $(XMODS) \
+		$(IMPLEMENTATIONS) \
 		modlist modlist.sparc
 
 # Override for CPU_KMODS... they cannot be built
@@ -80,14 +79,12 @@ check		:=	TARGET= check
 .NO_PARALLEL:	$(CPU_KMODS)
 
 def all clean clobber clean.lint: genassym unix .WAIT \
-	$(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) \
-	$(IMPLEMENTATIONS) $(CLOSED_IMPLEMENTATIONS)
+	$(KMODS) $(XMODS) $(IMPLEMENTATIONS)
 
 clobber: clobber.targ
 
 # list the modules under sun4u.
-modlist: unix $(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) \
-	$(IMPLEMENTATIONS:.WAIT=) $(CLOSED_IMPLEMENTATIONS)
+modlist: unix $(KMODS) $(XMODS) $(IMPLEMENTATIONS:.WAIT=)
 
 # list the modules for Install -k sun4u.
 modlist.karch: modlist modlist.sparc
@@ -95,12 +92,12 @@ modlist.karch: modlist modlist.sparc
 modlist.sparc:
 	@cd $(SRC)/uts/sparc; pwd; $(MAKE) $(NO_STATE) modlist
 
-install: install_platforms genassym unix .WAIT $(KMODS) $(CLOSED_KMODS) \
-	$(XMODS) $(CLOSED_XMODS) $(IMPLEMENTATIONS) $(CLOSED_IMPLEMENTATIONS)
+install: install_platforms genassym unix .WAIT $(KMODS) \
+	$(XMODS) $(IMPLEMENTATIONS)
 
 lintlib:	unix
 
-modlintlib:	$(LINT_KMODS) $(CLOSED_LINT_KMODS)
+modlintlib:	$(LINT_KMODS)
 
 genassym unix $(KMODS):	FRC
 	@cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
@@ -195,10 +192,6 @@ genunix: $(PRIVS_C)
 $(IMPLEMENTATIONS):	FRC
 	@cd $@; pwd; THISIMPL=$@ $(MAKE) $(NO_STATE) $(TARGET)
 
-$(CLOSED_IMPLEMENTATIONS):	FRC
-	cd $(CLOSED)/uts/sun4u/$@; pwd; \
-	    THISIMPL=$@ $(MAKE) $(NO_STATE) $(TARGET); \
-
 $(XMODS):	FRC
 	@if [ -f $@/Makefile  ]; then \
 		cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET); \
@@ -206,18 +199,7 @@ $(XMODS):	FRC
 		true; \
 	fi
 
-$(CLOSED_XMODS):	FRC
-	@if [ -f $(CLOSED)/uts/sun4u/$@/Makefile ]; then \
-		cd $(CLOSED)/uts/sun4u/$@; pwd; $(MAKE) $(NO_STATE) $(TARGET); \
-	else \
-		true; \
-	fi
-
-$(CLOSED_KMODS):	FRC
-	cd $(CLOSED)/uts/sun4u/$@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
-
-install_h check: install_platforms $(IMPLEMENTATIONS) \
-	$(CLOSED_IMPLEMENTATIONS) FRC
+install_h check: install_platforms $(IMPLEMENTATIONS)
 	@cd sys; pwd; $(MAKE) $(TARGET)
 	@cd vm; pwd; $(MAKE) $(TARGET)
 
@@ -287,7 +269,7 @@ globallint:
 	@-$(LINT) $(LINTFLAGS) $(LINT_LIBS) 2>&1 | $(LGREP.2)
 
 lint:	lintlib .WAIT modlintlib .WAIT $(SPARC_LINTS) $(LINT_DEPS) \
-	$(IMPLEMENTATIONS) $(CLOSED_IMPLEMENTATIONS) $(CPU_KMODS)
+	$(IMPLEMENTATIONS) $(CPU_KMODS)
 
 include ../Makefile.targ
 
@@ -295,11 +277,7 @@ include ../Makefile.targ
 # Cross-reference customization: build a cross-reference over all of the
 # sun4u-related directories.
 #
-SHARED_XRDIRS	= ../sun4u ../sun4 ../sfmmu ../sparc ../sun ../common
-CLOSED_XRDIRS	= $(SHARED_XRDIRS:../%=../% ../../../closed/uts/%)
-XRDIRS		= $(SHARED_XRDIRS)
-$(CLOSED_BUILD)XRDIRS	= $(CLOSED_XRDIRS:../../../closed/uts/sfmmu=)
-
+XRDIRS	= ../sun4u ../sun4 ../sfmmu ../sparc ../sun ../common
 XRPRUNE = i86pc
 
 cscope.out tags: FRC
diff --git a/usr/src/uts/sun4u/Makefile.sun4u.shared b/usr/src/uts/sun4u/Makefile.sun4u.shared
index 3d83c4f462..bbab20ce57 100644
--- a/usr/src/uts/sun4u/Makefile.sun4u.shared
+++ b/usr/src/uts/sun4u/Makefile.sun4u.shared
@@ -156,7 +156,7 @@ include $(UTSTREE)/common/Makefile.files
 #
 include $(UTSBASE)/Makefile.uts
 
-# These come after Makefile.uts (for CLOSED_BUILD).
+# These come after Makefile.uts.
 IMPLEMENTATIONS		 = tazmo 
 IMPLEMENTATIONS		+= starfire 
 IMPLEMENTATIONS		+= javelin 
@@ -186,9 +186,6 @@ IMPLEMENTATIONS		+= makaha
 IMPLEMENTATIONS		+= opl 
 IMPLEMENTATIONS		+= lw2plus 
 
-$(CLOSED_BUILD)CLOSED_IMPLEMENTATIONS	= chalupa 
-$(CLOSED_BUILD)CLOSED_IMPLEMENTATIONS	+= ents 
-
 #
 #	machine specific optimization, override default in Makefile.master
 #
@@ -398,12 +395,6 @@ DRV_KMODS	+= nxge
 DRV_KMODS	+= i2bsc 
 DRV_KMODS	+= mem_cache
 
-$(CLOSED_BUILD)CLOSED_DRV_KMODS	+= ctsmc
-$(CLOSED_BUILD)CLOSED_DRV_KMODS	+= m1535ppm
-$(CLOSED_BUILD)CLOSED_DRV_KMODS	+= memtest
-$(CLOSED_BUILD)CLOSED_DRV_KMODS	+= mi2cv
-$(CLOSED_BUILD)CLOSED_DRV_KMODS	+= smbus_ara
-
 #
 #	Exec Class Modules (/kernel/exec):
 #
@@ -460,7 +451,6 @@ GENUNIX_KMODS	+= genunix
 
 #	'User' "Modules" excluded from the Full Kernel lint target:
 #
-$(CLOSED_BUILD)CLOSED_NLMISC_KMODS	+= forthdebug
 
 #
 #	Modules eXcluded from the product:
@@ -479,8 +469,6 @@ TOD_KMODS	+= todds1287 todds1337 todmostek todstarfire
 TOD_KMODS	+= todm5819 todblade todbq4802 todsg todopl
 TOD_KMODS	+= todm5819p_rmc todstarcat 
 
-$(CLOSED_BUILD)CLOSED_TOD_KMODS	+= todm5823
-
 #
 #	Performance Counter BackEnd Modules (/usr/kernel/pcbe):
 #
diff --git a/usr/src/uts/sun4u/blade/Makefile.blade.shared b/usr/src/uts/sun4u/blade/Makefile.blade.shared
index a89230bde3..366e627d0c 100644
--- a/usr/src/uts/sun4u/blade/Makefile.blade.shared
+++ b/usr/src/uts/sun4u/blade/Makefile.blade.shared
@@ -19,8 +19,6 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
@@ -86,7 +84,7 @@ include $(UTSTREE)/sun4u/blade/Makefile.files
 include $(UTSTREE)/sun4u/Makefile.sun4u
 
 #
-#	Define modules (must come after Makefile.sun4u, for CLOSED_BUILD).
+#	Define modules (must come after Makefile.sun4u).
 #
 BLADE_KMODS		= platmod
 BLADE_KMODS		+= bscbus
diff --git a/usr/src/uts/sun4u/grover/Makefile.grover.shared b/usr/src/uts/sun4u/grover/Makefile.grover.shared
index 430d407351..6a19aa1ef5 100644
--- a/usr/src/uts/sun4u/grover/Makefile.grover.shared
+++ b/usr/src/uts/sun4u/grover/Makefile.grover.shared
@@ -23,8 +23,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 #	Global definitions for sun4u implementation specific modules.
 #
 
@@ -68,13 +66,11 @@ include $(UTSTREE)/sun4u/grover/Makefile.files
 include $(UTSTREE)/sun4u/Makefile.sun4u
 
 #
-#	Define modules (must come after Makefile.sun4u, for CLOSED_BUILD).
+#	Define modules (must come after Makefile.sun4u).
 #
 GROVER_KMODS	= platmod
 GROVER_KMODS	+= grfans
 
-$(CLOSED_BUILD)CLOSED_GROVER_KMODS	+= grppm
-
 #
 # For now, disable these lint checks; maintainers should endeavor
 # to investigate and remove these for maximum lint coverage.
diff --git a/usr/src/uts/sun4u/javelin/Makefile.javelin.shared b/usr/src/uts/sun4u/javelin/Makefile.javelin.shared
index 1e45fc1070..53e59004cd 100644
--- a/usr/src/uts/sun4u/javelin/Makefile.javelin.shared
+++ b/usr/src/uts/sun4u/javelin/Makefile.javelin.shared
@@ -23,8 +23,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 #	This makefile contains the common definitions for the
 #	sun4u Javelin system dependent modules.
 #
@@ -71,7 +69,7 @@ include $(UTSTREE)/sun4u/javelin/Makefile.files
 include $(UTSTREE)/sun4u/Makefile.sun4u
 
 #
-# Define modules (must come after Makefile.sun4u, for CLOSED_BUILD)
+# Define modules (must come after Makefile.sun4u)
 #
 JAVELIN_KMODS	= platmod
 JAVELIN_KMODS	+= envctrltwo
diff --git a/usr/src/uts/sun4u/mpxu/Makefile.mpxu.shared b/usr/src/uts/sun4u/mpxu/Makefile.mpxu.shared
index 4c82d112b3..86c40a6b5a 100644
--- a/usr/src/uts/sun4u/mpxu/Makefile.mpxu.shared
+++ b/usr/src/uts/sun4u/mpxu/Makefile.mpxu.shared
@@ -83,10 +83,9 @@ include $(UTSTREE)/sun4u/mpxu/Makefile.files
 include $(UTSTREE)/sun4u/Makefile.sun4u
 
 #
-#	Define modules (must come after Makefile.sun4u, for CLOSED_BUILD).
+#	Define modules (must come after Makefile.sun4u).
 #
 MPXU_KMODS	= tsalarm
-$(CLOSED_BUILD)CLOSED_MPXU_KMODS	= platmod ntwdt
 
 MODSTUBS_DIR	= $(UNIX_DIR)
 LINTS_DIR	= $(OBJS_DIR)
diff --git a/usr/src/uts/sun4u/opl/Makefile.opl.shared b/usr/src/uts/sun4u/opl/Makefile.opl.shared
index 934edae30a..584e7f9488 100644
--- a/usr/src/uts/sun4u/opl/Makefile.opl.shared
+++ b/usr/src/uts/sun4u/opl/Makefile.opl.shared
@@ -105,11 +105,6 @@ include $(UTSTREE)/sun4u/opl/Makefile.files
 include $(UTSTREE)/sun4u/Makefile.sun4u
 
 #
-#	Define closed modules (must come after Makefile.sun4u for CLOSED_BUILD).
-#
-$(CLOSED_BUILD)CLOSED_OPL_KMODS = scfd
-
-#
 #	Everybody needs to know how to build modstubs.o and to locate unix.o
 #
 UNIX_DIR	= $(UTSBASE)/$(PLATFORM)/opl/unix
diff --git a/usr/src/uts/sun4u/sunfire/Makefile.sunfire.shared b/usr/src/uts/sun4u/sunfire/Makefile.sunfire.shared
index 40119da802..657bca55c6 100644
--- a/usr/src/uts/sun4u/sunfire/Makefile.sunfire.shared
+++ b/usr/src/uts/sun4u/sunfire/Makefile.sunfire.shared
@@ -23,8 +23,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 #	Global definitions for sun4u implementation specific modules.
 #
 
@@ -68,10 +66,9 @@ include $(UTSTREE)/sun4u/sunfire/Makefile.files
 include $(UTSTREE)/sun4u/Makefile.sun4u
 
 #
-#	Define modules (must come after Makefile.sun4u for CLOSED_BUILD).
+#	Define modules (must come after Makefile.sun4u).
 #
 SUNFIRE_KMODS			= ac central environ fhc simmstat sysctrl sram
-$(CLOSED_BUILD)CLOSED_SUNFIRE_KMODS	= platmod
 
 #
 # For now, disable these lint checks; maintainers should endeavor
diff --git a/usr/src/uts/sun4u/sys/Makefile b/usr/src/uts/sun4u/sys/Makefile
index 4ac734662c..8e73425995 100644
--- a/usr/src/uts/sun4u/sys/Makefile
+++ b/usr/src/uts/sun4u/sys/Makefile
@@ -65,9 +65,6 @@ SUN4_HDRS=			\
 	xc_impl.h		\
 	zsmach.h
 
-$(CLOSED_BUILD)CLOSED_SUN4_HDRS=	\
-	memtestio.h
-
 HDRS=	\
 	cheetahregs.h		\
 	cpr_impl.h		\
@@ -99,20 +96,9 @@ HDRS=	\
 	todmostek.h		\
 	traptrace.h
 
-$(CLOSED_BUILD)CLOSED_HDRS=	\
-	memtestio_ch.h		\
-	memtestio_chp.h		\
-	memtestio_ja.h		\
-	memtestio_jg.h		\
-	memtestio_oc.h		\
-	memtestio_pn.h		\
-	memtestio_sf.h		\
-	memtestio_sr.h		\
-	memtestio_u.h
-
 I2CHDRS =	clients/max1617.h misc/i2c_svc.h clients/i2c_client.h	\
 		clients/hpc3130.h clients/lm75.h	\
-		clients/pcf8591.h clients/ssc050.h $(CLOSED_I2CHDRS)
+		clients/pcf8591.h clients/ssc050.h
 
 I2C_DIRS=	clients misc
 USR_PSM_ISYS_I2C_ROOT=	$(USR_PSM_ISYS_DIR)/i2c
@@ -127,10 +113,8 @@ MONHDRS=
 USR_PSM_MON_DIR=	$(USR_PSM_ISYS_DIR)/mon
 
 ROOTHDRS=		$(HDRS:%=$(USR_PSM_ISYS_DIR)/%)
-$(CLOSED_BUILD)ROOTHDRS += $(CLOSED_HDRS:%=$(USR_PSM_ISYS_DIR)/%)
 
 SUN4_ROOTHDRS=		$(SUN4_HDRS:%=$(USR_PSM_ISYS_DIR)/%)
-$(CLOSED_BUILD)SUN4_ROOTHDRS += $(CLOSED_SUN4_HDRS:%=$(USR_PSM_ISYS_DIR)/%)
 
 ROOTMONHDRS=		$(MONHDRS:%=$(USR_PSM_MON_DIR)/%)
 
@@ -144,10 +128,6 @@ CHECKHDRS=		$(HDRS:%.h=%.check) \
 			$(MONHDRS:%.h=mon/%.check) \
 			$(SUN4_HDRS:%.h=%.cmncheck)
 
-$(CLOSED_BUILD)CHECKHDRS += $(CLOSED_HDRS:%.h=$(CLOSED)/uts/sun4u/sys/%.check)
-$(CLOSED_BUILD)CHECKHDRS += \
-		$(CLOSED_I2CHDRS:%.h=$(CLOSED)/uts/sun4u/sys/i2c/%.check)
-
 .KEEP_STATE:
 
 .PARALLEL: $(CHECKHDRS) $(ROOTHDRS) $(ROOTMONHDRS) $(SUN4_ROOTHDRS)
@@ -168,12 +148,6 @@ $(USR_PSM_MON_DIR):	$(USR_PSM_ISYS_DIR)
 $(USR_PSM_ISYS_I2C_DIRS):
 	$(INS.dir)
 
-$(USR_PSM_ISYS_DIR)/%:	$(CLOSED)/uts/sun4u/sys/% $(USR_PSM_ISYS_DIR)
-	$(INS.file)
-
-$(USR_PSM_ISYS_DIR)/%:	$(CLOSED)/uts/sun4/sys/% $(USR_PSM_ISYS_DIR)
-	$(INS.file)
-
 $(USR_PSM_ISYS_DIR)/%:	../../sfmmu/sys/% $(USR_PSM_ISYS_DIR)
 	$(INS.file)
 
diff --git a/usr/src/uts/sun4u/tazmo/Makefile.tazmo.shared b/usr/src/uts/sun4u/tazmo/Makefile.tazmo.shared
index c544e392cf..7c0639ff27 100644
--- a/usr/src/uts/sun4u/tazmo/Makefile.tazmo.shared
+++ b/usr/src/uts/sun4u/tazmo/Makefile.tazmo.shared
@@ -23,8 +23,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 #	Global definitions for sun4u implementation specific modules.
 #
 
@@ -72,7 +70,7 @@ include $(UTSBASE)/sun4u/tazmo/Makefile.files
 include $(UTSTREE)/sun4u/Makefile.sun4u
 
 #
-#	Define modules (must come after Makefile.sun4u, for CLOSED_BUILD).
+#	Define modules (must come after Makefile.sun4u).
 #
 TAZMO_KMODS	= platmod
 TAZMO_KMODS	+= envctrl
diff --git a/usr/src/uts/sun4v/Makefile b/usr/src/uts/sun4v/Makefile
index bd41141c0b..4597f6d9f4 100644
--- a/usr/src/uts/sun4v/Makefile
+++ b/usr/src/uts/sun4v/Makefile
@@ -300,11 +300,7 @@ include ../Makefile.targ
 # Cross-reference customization: build a cross-reference over all of the
 # sun4v-related directories.
 #
-SHARED_XRDIRS	= ../sun4v ../sun4 ../sfmmu ../sparc ../sun ../common
-CLOSED_XRDIRS	= $(SHARED_XRDIRS:../%=../% ../../../closed/uts/%)
-XRDIRS		= $(SHARED_XRDIRS)
-$(CLOSED_BUILD)XRDIRS	= $(CLOSED_XRDIRS:../../../closed/uts/sfmmu=)
-
+XRDIRS	= ../sun4v ../sun4 ../sfmmu ../sparc ../sun ../common
 XRPRUNE = i86pc sun4u intel
 
 cscope.out tags: FRC
diff --git a/usr/src/uts/sun4v/Makefile.sun4v.shared b/usr/src/uts/sun4v/Makefile.sun4v.shared
index 30706a7c08..f30ab80338 100644
--- a/usr/src/uts/sun4v/Makefile.sun4v.shared
+++ b/usr/src/uts/sun4v/Makefile.sun4v.shared
@@ -358,11 +358,6 @@ DRV_KMODS	+= vnet
 DRV_KMODS	+= vnex
 DRV_KMODS	+= vsw
 
-$(CLOSED_BUILD)CLOSED_DRV_KMODS	+= bmc
-$(CLOSED_BUILD)CLOSED_DRV_KMODS	+= memtest
-$(CLOSED_BUILD)CLOSED_DRV_KMODS	+= ncp
-$(CLOSED_BUILD)CLOSED_DRV_KMODS	+= n2cp
-
 #
 #	Exec Class Modules (/kernel/exec):
 #
@@ -423,10 +418,6 @@ CRYPTO_KMODS	+= arcfour
 #
 GENUNIX_KMODS	+= genunix
 
-#	'User' "Modules" excluded from the Full Kernel lint target:
-#
-$(CLOSED_BUILD)CLOSED_NLMISC_KMODS	+= forthdebug
-
 #
 #	Modules eXcluded from the product:
 #
diff --git a/usr/src/uts/sun4v/sys/Makefile b/usr/src/uts/sun4v/sys/Makefile
index bd0408ba63..2af0d8841b 100644
--- a/usr/src/uts/sun4v/sys/Makefile
+++ b/usr/src/uts/sun4v/sys/Makefile
@@ -65,9 +65,6 @@ SUN4_HDRS=			\
 	xc_impl.h		\
 	zsmach.h
 
-CLOSED_SUN4_HDRS=			\
-	memtestio.h
-
 HDRS=	\
 	ds_pri.h		\
 	ds_snmp.h		\
@@ -92,18 +89,9 @@ HDRS=	\
 	traptrace.h		\
 	vlds.h
 
-CLOSED_HDRS=	\
-	memtestio_kt.h		\
-	memtestio_ni.h		\
-	memtestio_n2.h		\
-	memtestio_v.h		\
-	memtestio_vf.h
-
 ROOTHDRS=		$(HDRS:%=$(USR_PSM_ISYS_DIR)/%)
-$(CLOSED_BUILD)ROOTHDRS += $(CLOSED_HDRS:%=$(USR_PSM_ISYS_DIR)/%)
 
 SUN4_ROOTHDRS=		$(SUN4_HDRS:%=$(USR_PSM_ISYS_DIR)/%)
-$(CLOSED_BUILD)SUN4_ROOTHDRS += $(CLOSED_SUN4_HDRS:%=$(USR_PSM_ISYS_DIR)/%)
 
 ROOTDIR=		$(ROOT)/usr/share/src
 ROOTDIRS=		$(ROOTDIR)/uts $(ROOTDIR)/uts/$(PLATFORM)
@@ -114,10 +102,6 @@ LINKDEST=		../../../../platform/$(PLATFORM)/include/sys
 CHECKHDRS=		$(HDRS:%.h=%.check) \
 			$(SUN4_HDRS:%.h=%.cmncheck)
 
-$(CLOSED_BUILD)CHECKHDRS +=			\
-	$(CLOSED_HDRS:%.h=%.check)		\
-	$(CLOSED_SUN4_HDRS:%.h=%.cmncheck)
-
 .KEEP_STATE:
 
 .PARALLEL: $(CHECKHDRS) $(ROOTHDRS) $(SUN4_ROOTHDRS)
@@ -137,12 +121,6 @@ $(USR_PSM_ISYS_DIR)/%:	../../sfmmu/sys/% $(USR_PSM_ISYS_DIR)
 $(USR_PSM_ISYS_DIR)/%:	../../sun4/sys/% $(USR_PSM_ISYS_DIR)
 	$(INS.file)
 
-$(USR_PSM_ISYS_DIR)/%:	$(CLOSED)/uts/sun4/sys/% $(USR_PSM_ISYS_DIR)
-	$(INS.file)
-
-$(USR_PSM_ISYS_DIR)/%:	$(CLOSED)/uts/sun4v/sys/% $(USR_PSM_ISYS_DIR)
-	$(INS.file)
-
 $(ROOTDIRS):
 	$(INS.dir)
 
@@ -155,12 +133,8 @@ mon/%.check:	mon/%.h
 
 %.check:	../../sfmmu/sys/%.h
 	$(DOT_H_CHECK)
-%.check:	$(CLOSED)/uts/sun4v/sys/%.h
-	$(DOT_H_CHECK)
 %.cmncheck:	../../sun4/sys/%.h
 	$(DOT_H_CHECK)
-%.cmncheck:	$(CLOSED)/uts/sun4/sys/%.h
-	$(DOT_H_CHECK)
 
 FRC:
author	Josef 'Jeff' Sipek <jeffpc@josefsipek.net>	2013-10-15 00:21:04 -0400
committer	Richard Lowe <richlowe@richlowe.net>	2013-10-23 19:52:25 -0400
commit	c0e7977a434048a8bc7386ea0e8befaa77a646cf (patch)
tree	283ae7c385818ecd7d479cdfb593604c703193ac
parent	e7eebcf69de21d2c4df15f003919cdb19b61c694 (diff)
download	illumos-gate-c0e7977a434048a8bc7386ea0e8befaa77a646cf.tar.gz