[illumos-gate merge]

commit 192a5ca9fe8b81784c9921860f876735fc9a1e3e
    8371 remove warlock files in usr/src/uts
commit cabd62a218e426e3dea29d3051d184458cdddbdf
    8393 bnxe: left shift of negative value and bad macro
commit a17ce84520dc4e972c913e0fa1d1545ddd22b55e
    8392 Do not cast the return value of xdr_free()
commit 5c25b6f10367f6cb7b3d8b8bc7e374712eb977c2
    8367 remove warlock leftovers from usr/src/uts Makefiles
commit eb28af623974cfc31cb4545d2965bbaca3fb6888
    8329 ldapcachemgr: misleading-indentation
    8364 ldapcachemgr does not set log file in debug mode if -l was not used
commit 0d56f5df8a4bc5dd756cf0ea58ab3e0519c76032
    8223 libshell: misleading-indentation
commit 7bdb5b9a077c9ce26caedc489a6a5ee9e45214ed
    7876 libast: misleading-indentation errors
commit f15a6fde3c0a52aca95943ffd637d7b8220e2261
    8379 illumos-gate 'install' make target is too eager building things
    8360 ipdadm missing 'all' target
    8359 libzpool Makefiles are slightly broken
commit 99d29265ec47e10c7ec8c18a67fc83e7dd5ce4f8
    8397 sysevent.h: C++11 requires a space between literal and string macro
commit 02dc24bdf7a983da73ebfd10cc3b5627a74789c5
    8410 ucoreadm links against libraries outside the proto area
commit 00bdf9afcd6a60aceb896a5b75ac0a061981ee94
    8394 fcoet: array subscript is above array bounds
commit 24a150c1bcca7eba0f2d518d0f41645eb55f6066
    8398 pcmcia: sizeof on array function parameter

	Conflicts:
	usr/src/uts/common/sys/sysevent.h

267 files changed, 432 insertions, 15887 deletions

diff --git a/usr/src/Makefile b/usr/src/Makefile
index 83491a3469..a7a4f8b1fa 100644
--- a/usr/src/Makefile
+++ b/usr/src/Makefile
@@ -25,7 +25,7 @@
 # Copyright 2014 Garrett D'Amore <garrett@damore.org>
 # Copyright 2015 OmniTI Computer Consulting, Inc. All rights reserved.
 # Copyright 2016 Toomas Soome <tsoome@me.com>
-# Copyright 2016 Joyent, Inc.
+# Copyright 2017 Joyent, Inc.
 #
 
 #
@@ -123,7 +123,7 @@ stage-licenses: install2
 
 install1: mapfiles closedbins sgs
 
-install2: install1 $(SUBDIRS)
+install2: install1 .WAIT $(SUBDIRS)
 
 _msg: _msgdirs rootdirs FRC
 	@for m in $(MSGSUBDIRS); do \
diff --git a/usr/src/cmd/idmap/idmapd/adspriv_impl.c b/usr/src/cmd/idmap/idmapd/adspriv_impl.c
index b1dcbe3163..7386ada6f6 100644
--- a/usr/src/cmd/idmap/idmapd/adspriv_impl.c
+++ b/usr/src/cmd/idmap/idmapd/adspriv_impl.c
@@ -205,6 +205,6 @@ out:
 int
 adspriv_program_1_freeresult(SVCXPRT *xprt, xdrproc_t fun, caddr_t res)
 {
-	(void) xdr_free(fun, res);
+	xdr_free(fun, res);
 	return (TRUE);
 }
diff --git a/usr/src/cmd/idmap/idmapd/server.c b/usr/src/cmd/idmap/idmapd/server.c
index e27690a160..10b6486350 100644
--- a/usr/src/cmd/idmap/idmapd/server.c
+++ b/usr/src/cmd/idmap/idmapd/server.c
@@ -179,7 +179,7 @@ validate_rules(idmap_update_batch *batch)
 /* ARGSUSED */
 bool_t
 idmap_get_mapped_ids_1_svc(idmap_mapping_batch batch,
-		idmap_ids_res *result, struct svc_req *rqstp)
+    idmap_ids_res *result, struct svc_req *rqstp)
 {
 	sqlite		*cache = NULL, *db = NULL;
 	lookup_state_t	state;
@@ -718,7 +718,7 @@ out:
 	if (sql)
 		sqlite_freemem(sql);
 	if (IDMAP_ERROR(result->retcode))
-		(void) xdr_free(xdr_idmap_mappings_res, (caddr_t)result);
+		xdr_free(xdr_idmap_mappings_res, (caddr_t)result);
 	result->retcode = idmap_stat4prot(result->retcode);
 	return (TRUE);
 }
@@ -798,8 +798,7 @@ list_namerules_cb(void *parg, int argc, char **argv, char **colnames)
 /* ARGSUSED */
 bool_t
 idmap_list_namerules_1_svc(idmap_namerule rule, uint64_t lastrowid,
-		uint64_t limit, idmap_namerules_res *result,
-		struct svc_req *rqstp)
+    uint64_t limit, idmap_namerules_res *result, struct svc_req *rqstp)
 {
 
 	sqlite		*db = NULL;
@@ -865,7 +864,7 @@ out:
 	if (sql)
 		sqlite_freemem(sql);
 	if (IDMAP_ERROR(result->retcode))
-		(void) xdr_free(xdr_idmap_namerules_res, (caddr_t)result);
+		xdr_free(xdr_idmap_namerules_res, (caddr_t)result);
 	result->retcode = idmap_stat4prot(result->retcode);
 	return (TRUE);
 }
@@ -922,7 +921,7 @@ verify_rules_auth(struct svc_req *rqstp)
 /* ARGSUSED */
 bool_t
 idmap_update_1_svc(idmap_update_batch batch, idmap_update_res *res,
-		struct svc_req *rqstp)
+    struct svc_req *rqstp)
 {
 	sqlite		*db = NULL;
 	idmap_update_op	*up;
@@ -1113,7 +1112,7 @@ errout:
 /* ARGSUSED */
 bool_t
 idmap_get_mapped_id_by_name_1_svc(idmap_mapping request,
-		idmap_mappings_res *result, struct svc_req *rqstp)
+    idmap_mappings_res *result, struct svc_req *rqstp)
 {
 	idmap_mapping_batch batch_request;
 	idmap_ids_res batch_result;
@@ -1194,7 +1193,7 @@ out:
 /* ARGSUSED */
 bool_t
 idmap_get_prop_1_svc(idmap_prop_type request,
-		idmap_prop_res *result, struct svc_req *rqstp)
+    idmap_prop_res *result, struct svc_req *rqstp)
 {
 	idmap_pg_config_t *pgcfg;
 
@@ -1311,9 +1310,9 @@ idmap_flush_1_svc(
 /* ARGSUSED */
 int
 idmap_prog_1_freeresult(SVCXPRT *transp, xdrproc_t xdr_result,
-		caddr_t result)
+    caddr_t result)
 {
-	(void) xdr_free(xdr_result, result);
+	xdr_free(xdr_result, result);
 	return (TRUE);
 }
 
diff --git a/usr/src/cmd/ipdadm/Makefile b/usr/src/cmd/ipdadm/Makefile
index 349899e5f6..5f4690b32b 100644
--- a/usr/src/cmd/ipdadm/Makefile
+++ b/usr/src/cmd/ipdadm/Makefile
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright (c) 2012 Joyent, Inc.  All rights reserved.
+# Copyright (c) 2017 Joyent, Inc.  All rights reserved.
 #
 
 PROG= ipdadm
@@ -40,6 +40,8 @@ lint: lint_PROG
 	$(COMPILE.c) $<
 	$(POST_PROCESS_O)
 
-install: $(PROG) $(ROOTUSRSBINPROG)
+all: $(PROG)
+
+install: all $(ROOTUSRSBINPROG)
 
 include ../Makefile.targ
diff --git a/usr/src/cmd/ldapcachemgr/cachemgr.c b/usr/src/cmd/ldapcachemgr/cachemgr.c
index 3abb73734a..8ba7e1800e 100644
--- a/usr/src/cmd/ldapcachemgr/cachemgr.c
+++ b/usr/src/cmd/ldapcachemgr/cachemgr.c
@@ -448,9 +448,7 @@ main(int argc, char ** argv)
 			 * no specified log file
 			 */
 			(void) strcpy(current_admin.logfile, LOGFILE);
-		else
-			(void) cachemgr_set_lf(&current_admin,
-			    current_admin.logfile);
+		(void) cachemgr_set_lf(&current_admin, current_admin.logfile);
 		/*
 		 * validate the range of debug level number
 		 * and set the number to current_admin.debug_level
@@ -470,8 +468,7 @@ main(int argc, char ** argv)
 	} else {
 		if (strlen(current_admin.logfile) == 0)
 			(void) strcpy(current_admin.logfile, "/dev/null");
-			(void) cachemgr_set_lf(&current_admin,
-			    current_admin.logfile);
+		(void) cachemgr_set_lf(&current_admin, current_admin.logfile);
 	}
 
 	if (dofg == 0)
@@ -1405,12 +1402,11 @@ is_root(int free_uc, char *dc_str, ucred_t **ucp)
 
 int
 is_called_from_nscd(pid_t pid)
-
 {
 	static mutex_t	_door_lock = DEFAULTMUTEX;
 	static	int	doorfd = -1;
 	int		match;
-	door_info_t 	my_door;
+	door_info_t	my_door;
 
 	/*
 	 * the first time in we try and open and validate the door.
diff --git a/usr/src/cmd/ucodeadm/Makefile b/usr/src/cmd/ucodeadm/Makefile
index 1fb1938265..1abe8bb420 100644
--- a/usr/src/cmd/ucodeadm/Makefile
+++ b/usr/src/cmd/ucodeadm/Makefile
@@ -22,6 +22,8 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2017 RackTop Systems.
+#
 
 PROG = ucodeadm
 
@@ -50,7 +52,7 @@ CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-type-limits
 LINTFLAGS += -errtags -erroff=E_NAME_DEF_NOT_USED2
 LINTFLAGS += -erroff=E_INCONS_ARG_DECL2,E_INCONS_VAL_TYPE_DECL2
-LDLIBS = -lgen
+LDLIBS += -lgen
 
 DIRMODE = 0755
 FILEMODE = 0555
diff --git a/usr/src/lib/libast/common/misc/magic.c b/usr/src/lib/libast/common/misc/magic.c
index f4b3037fc0..9a0345b00d 100644
--- a/usr/src/lib/libast/common/misc/magic.c
+++ b/usr/src/lib/libast/common/misc/magic.c
@@ -1145,24 +1145,24 @@ cklang(register Magic_t* mp, const char* file, char* buf, struct stat* st)
 									mp->multi['X']++;
 								break;
 							}
-							if (!mp->idtab)
-							{
-								if (mp->idtab = dtnew(mp->vm, &mp->dtdisc, Dthash))
-									for (q = 0; q < elementsof(dict); q++)
-										dtinsert(mp->idtab, &dict[q]);
-								else if (mp->disc->errorf)
-									(*mp->disc->errorf)(mp, mp->disc, 3, "out of space");
-								q = 0;
-							}
-							if (mp->idtab)
-							{
-								*(b - 1) = 0;
-								if (ip = (Info_t*)dtmatch(mp->idtab, s))
-									mp->identifier[ip->value]++;
-								*(b - 1) = c;
-							}
-							s = 0;
+						if (!mp->idtab)
+						{
+							if (mp->idtab = dtnew(mp->vm, &mp->dtdisc, Dthash))
+								for (q = 0; q < elementsof(dict); q++)
+									dtinsert(mp->idtab, &dict[q]);
+							else if (mp->disc->errorf)
+								(*mp->disc->errorf)(mp, mp->disc, 3, "out of space");
+							q = 0;
+						}
+						if (mp->idtab)
+						{
+							*(b - 1) = 0;
+							if (ip = (Info_t*)dtmatch(mp->idtab, s))
+								mp->identifier[ip->value]++;
+							*(b - 1) = c;
 						}
+						s = 0;
+					}
 					switch (c)
 					{
 					case '\t':
diff --git a/usr/src/lib/libast/common/sfio/sfpool.c b/usr/src/lib/libast/common/sfio/sfpool.c
index be01693b5d..6167d1738b 100644
--- a/usr/src/lib/libast/common/sfio/sfpool.c
+++ b/usr/src/lib/libast/common/sfio/sfpool.c
@@ -288,7 +288,8 @@ reg int		mode;
 
 	/* f already in the same pool with pf */
 	if(f == pf || (pf && f->pool == pf->pool && f->pool != &_Sfpool) )
-	{	if(f)
+	{
+		if(f)
 			SFMTXUNLOCK(f);
 		if(pf)
 			SFMTXUNLOCK(pf);
diff --git a/usr/src/lib/libast/common/vmalloc/vmbest.c b/usr/src/lib/libast/common/vmalloc/vmbest.c
index a9c622d2ad..76e903d1f4 100644
--- a/usr/src/lib/libast/common/vmalloc/vmbest.c
+++ b/usr/src/lib/libast/common/vmalloc/vmbest.c
@@ -980,7 +980,8 @@ int		type;		/* !=0 to move, <0 for not copy */
 				CLRBITS(s);
 			}
 			else if(ISJUNK(s) )
-			{	if(!bestreclaim(vd,np,C_INDEX(s)) )
+			{
+				if(!bestreclaim(vd,np,C_INDEX(s)) )
 					/**/ASSERT(0); /* oops: did not see np! */
 				s = SIZE(np); /**/ASSERT(s%ALIGN == 0);
 			}
diff --git a/usr/src/lib/libidmap/common/idmap_api.c b/usr/src/lib/libidmap/common/idmap_api.c
index ddfefc39c2..54ee78bfe4 100644
--- a/usr/src/lib/libidmap/common/idmap_api.c
+++ b/usr/src/lib/libidmap/common/idmap_api.c
@@ -234,7 +234,7 @@ out:
 		_IDMAP_RESET_UDT_HANDLE(udthandle);
 	}
 
-	(void) xdr_free(xdr_idmap_update_res, (caddr_t)&res);
+	xdr_free(xdr_idmap_update_res, (caddr_t)&res);
 	errno = idmap_stat2errno(retcode);
 	return (retcode);
 }
@@ -414,9 +414,9 @@ idmap_udt_destroy(idmap_udt_handle_t *udthandle)
 {
 	if (udthandle == NULL)
 		return;
-	(void) xdr_free(xdr_idmap_update_batch, (caddr_t)&udthandle->batch);
-	(void) xdr_free(xdr_idmap_namerule, (caddr_t)&udthandle->error_rule);
-	(void) xdr_free(xdr_idmap_namerule, (caddr_t)&udthandle->conflict_rule);
+	xdr_free(xdr_idmap_update_batch, (caddr_t)&udthandle->batch);
+	xdr_free(xdr_idmap_namerule, (caddr_t)&udthandle->error_rule);
+	xdr_free(xdr_idmap_namerule, (caddr_t)&udthandle->conflict_rule);
 	free(udthandle);
 }
 
@@ -461,7 +461,7 @@ idmap_udt_add_namerule(idmap_udt_handle_t *udthandle, const char *windomain,
 errout:
 	/* The batch should still be usable */
 	if (rule)
-		(void) xdr_free(xdr_idmap_namerule, (caddr_t)rule);
+		xdr_free(xdr_idmap_namerule, (caddr_t)rule);
 	errno = idmap_stat2errno(retcode);
 	return (retcode);
 }
@@ -506,7 +506,7 @@ idmap_udt_rm_namerule(idmap_udt_handle_t *udthandle, boolean_t is_user,
 
 errout:
 	if (rule)
-		(void) xdr_free(xdr_idmap_namerule, (caddr_t)rule);
+		xdr_free(xdr_idmap_namerule, (caddr_t)rule);
 	errno = idmap_stat2errno(retcode);
 	return (retcode);
 }
@@ -565,9 +565,9 @@ idmap_iter_set_limit(idmap_iter_t *iter, uint64_t limit)
  * iter - iterator
  */
 idmap_stat
-idmap_iter_namerules(const char *windomain,
-		boolean_t is_user, boolean_t is_wuser, const char *winname,
-		const char *unixname, idmap_iter_t **iter)
+idmap_iter_namerules(const char *windomain, boolean_t is_user,
+    boolean_t is_wuser, const char *winname, const char *unixname,
+    idmap_iter_t **iter)
 {
 
 	idmap_iter_t			*tmpiter;
@@ -965,7 +965,7 @@ idmap_get_create(idmap_get_handle_t **gh)
  */
 idmap_stat
 idmap_get_uidbysid(idmap_get_handle_t *gh, char *sidprefix, idmap_rid_t rid,
-		int flag, uid_t *uid, idmap_stat *stat)
+    int flag, uid_t *uid, idmap_stat *stat)
 {
 	return (idmap_getext_uidbysid(gh, sidprefix, rid, flag, uid,
 	    NULL, stat));
@@ -989,7 +989,7 @@ idmap_get_uidbysid(idmap_get_handle_t *gh, char *sidprefix, idmap_rid_t rid,
 
 idmap_stat
 idmap_getext_uidbysid(idmap_get_handle_t *gh, char *sidprefix, idmap_rid_t rid,
-		int flag, uid_t *uid, idmap_info *info, idmap_stat *stat)
+    int flag, uid_t *uid, idmap_info *info, idmap_stat *stat)
 {
 	idmap_retcode	retcode;
 	idmap_mapping	*mapping = NULL;
@@ -1059,7 +1059,7 @@ errout:
  */
 idmap_stat
 idmap_get_gidbysid(idmap_get_handle_t *gh, char *sidprefix, idmap_rid_t rid,
-		int flag, gid_t *gid, idmap_stat *stat)
+    int flag, gid_t *gid, idmap_stat *stat)
 {
 	return (idmap_getext_gidbysid(gh, sidprefix, rid, flag, gid,
 	    NULL, stat));
@@ -1083,7 +1083,7 @@ idmap_get_gidbysid(idmap_get_handle_t *gh, char *sidprefix, idmap_rid_t rid,
  */
 idmap_stat
 idmap_getext_gidbysid(idmap_get_handle_t *gh, char *sidprefix, idmap_rid_t rid,
-		int flag, gid_t *gid, idmap_info *info, idmap_stat *stat)
+    int flag, gid_t *gid, idmap_info *info, idmap_stat *stat)
 {
 
 	idmap_retcode	retcode;
@@ -1156,7 +1156,7 @@ errout:
  */
 idmap_stat
 idmap_get_pidbysid(idmap_get_handle_t *gh, char *sidprefix, idmap_rid_t rid,
-		int flag, uid_t *pid, int *is_user, idmap_stat *stat)
+    int flag, uid_t *pid, int *is_user, idmap_stat *stat)
 {
 	return (idmap_getext_pidbysid(gh, sidprefix, rid, flag, pid, is_user,
 	    NULL, stat));
@@ -1183,7 +1183,7 @@ idmap_get_pidbysid(idmap_get_handle_t *gh, char *sidprefix, idmap_rid_t rid,
  */
 idmap_stat
 idmap_getext_pidbysid(idmap_get_handle_t *gh, char *sidprefix, idmap_rid_t rid,
-	int flag, uid_t *pid, int *is_user, idmap_info *info, idmap_stat *stat)
+    int flag, uid_t *pid, int *is_user, idmap_info *info, idmap_stat *stat)
 {
 	idmap_retcode	retcode;
 	idmap_mapping	*mapping = NULL;
@@ -1255,7 +1255,7 @@ errout:
  */
 idmap_stat
 idmap_get_sidbyuid(idmap_get_handle_t *gh, uid_t uid, int flag,
-		char **sidprefix, idmap_rid_t *rid, idmap_stat *stat)
+    char **sidprefix, idmap_rid_t *rid, idmap_stat *stat)
 {
 	return (idmap_getext_sidbyuid(gh, uid, flag, sidprefix, rid,
 	    NULL, stat));
@@ -1279,7 +1279,7 @@ idmap_get_sidbyuid(idmap_get_handle_t *gh, uid_t uid, int flag,
  */
 idmap_stat
 idmap_getext_sidbyuid(idmap_get_handle_t *gh, uid_t uid, int flag,
-	char **sidprefix, idmap_rid_t *rid, idmap_info *info, idmap_stat *stat)
+    char **sidprefix, idmap_rid_t *rid, idmap_info *info, idmap_stat *stat)
 {
 
 	idmap_retcode	retcode;
@@ -1346,7 +1346,7 @@ errout:
  */
 idmap_stat
 idmap_get_sidbygid(idmap_get_handle_t *gh, gid_t gid, int flag,
-		char **sidprefix, idmap_rid_t *rid, idmap_stat *stat)
+    char **sidprefix, idmap_rid_t *rid, idmap_stat *stat)
 {
 	return (idmap_getext_sidbygid(gh, gid, flag, sidprefix, rid,
 	    NULL, stat));
@@ -1370,7 +1370,7 @@ idmap_get_sidbygid(idmap_get_handle_t *gh, gid_t gid, int flag,
  */
 idmap_stat
 idmap_getext_sidbygid(idmap_get_handle_t *gh, gid_t gid, int flag,
-	char **sidprefix, idmap_rid_t *rid, idmap_info *info, idmap_stat *stat)
+    char **sidprefix, idmap_rid_t *rid, idmap_info *info, idmap_stat *stat)
 {
 
 	idmap_retcode	retcode;
@@ -1569,7 +1569,7 @@ idmap_get_mappings(idmap_get_handle_t *gh)
 
 out:
 	_IDMAP_RESET_GET_HANDLE(gh);
-	(void) xdr_free(xdr_idmap_ids_res, (caddr_t)&res);
+	xdr_free(xdr_idmap_ids_res, (caddr_t)&res);
 	errno = idmap_stat2errno(retcode);
 	return (retcode);
 }
@@ -1583,7 +1583,7 @@ idmap_get_destroy(idmap_get_handle_t *gh)
 {
 	if (gh == NULL)
 		return;
-	(void) xdr_free(xdr_idmap_mapping_batch, (caddr_t)&gh->batch);
+	xdr_free(xdr_idmap_mapping_batch, (caddr_t)&gh->batch);
 	if (gh->retlist)
 		free(gh->retlist);
 	free(gh);
@@ -2105,7 +2105,7 @@ idmap_how_clear(idmap_how *how)
  */
 idmap_stat
 idmap_getuidbywinname(const char *name, const char *domain, int flag,
-	uid_t *uid)
+    uid_t *uid)
 {
 	idmap_retcode	rc;
 	int		is_user = 1;
@@ -2140,7 +2140,7 @@ idmap_getuidbywinname(const char *name, const char *domain, int flag,
  */
 idmap_stat
 idmap_getgidbywinname(const char *name, const char *domain, int flag,
-	gid_t *gid)
+    gid_t *gid)
 {
 	idmap_retcode	rc;
 	int		is_user = 0;
@@ -2176,7 +2176,7 @@ idmap_getgidbywinname(const char *name, const char *domain, int flag,
  */
 idmap_stat
 idmap_getwinnamebypid(uid_t pid, int is_user, int flag, char **name,
-	char **domain)
+    char **domain)
 {
 	idmap_retcode	rc;
 	int		len;
diff --git a/usr/src/lib/libidmap/common/idmap_impl.h b/usr/src/lib/libidmap/common/idmap_impl.h
index 8dd4a7efb2..bcae8b6d8d 100644
--- a/usr/src/lib/libidmap/common/idmap_impl.h
+++ b/usr/src/lib/libidmap/common/idmap_impl.h
@@ -53,11 +53,11 @@ struct idmap_udt_handle {
 };
 
 #define	_IDMAP_RESET_UDT_HANDLE(uh) \
-	(void) xdr_free(xdr_idmap_update_batch, (caddr_t)&uh->batch);\
+	xdr_free(xdr_idmap_update_batch, (caddr_t)&uh->batch);\
 	uh->next = 0;\
 	uh->error_index = -1;\
-	(void) xdr_free(xdr_idmap_namerule, (caddr_t)&uh->error_rule);\
-	(void) xdr_free(xdr_idmap_namerule, (caddr_t)&uh->conflict_rule);
+	xdr_free(xdr_idmap_namerule, (caddr_t)&uh->error_rule);\
+	xdr_free(xdr_idmap_namerule, (caddr_t)&uh->conflict_rule);
 
 typedef struct idmap_get_res {
 	idmap_id_type	idtype;
@@ -78,7 +78,7 @@ struct idmap_get_handle {
 };
 
 #define	_IDMAP_RESET_GET_HANDLE(gh) \
-	(void) xdr_free(xdr_idmap_mapping_batch, (caddr_t)&gh->batch);\
+	xdr_free(xdr_idmap_mapping_batch, (caddr_t)&gh->batch);\
 	if (gh->retlist) \
 		free(gh->retlist);\
 	gh->retlist = NULL;\
diff --git a/usr/src/lib/libshell/common/sh/nvdisc.c b/usr/src/lib/libshell/common/sh/nvdisc.c
index 7c8918ef1f..2caaaa5888 100644
--- a/usr/src/lib/libshell/common/sh/nvdisc.c
+++ b/usr/src/lib/libshell/common/sh/nvdisc.c
@@ -915,8 +915,8 @@ int nv_clone(Namval_t *np, Namval_t *mp, int flags)
 	        nv_setsize(mp,nv_size(np));
 	if(mp->nvflag == flag)
 	        mp->nvflag = (np->nvflag&~(NV_MINIMAL))|(mp->nvflag&NV_MINIMAL);
-		if(nv_isattr(np,NV_EXPORT))
-			mp->nvflag |= (np->nvflag&NV_MINIMAL);
+	if(nv_isattr(np,NV_EXPORT))
+		mp->nvflag |= (np->nvflag&NV_MINIMAL);
 	if(mp->nvalue.cp==val && !nv_isattr(np,NV_INTEGER))
 	{
 		if(np->nvalue.cp && np->nvalue.cp!=Empty && (flags&NV_COMVAR) && !(flags&NV_MOVE))
diff --git a/usr/src/lib/libzpool/Makefile.com b/usr/src/lib/libzpool/Makefile.com
index b016ffaa70..17f24d1a11 100644
--- a/usr/src/lib/libzpool/Makefile.com
+++ b/usr/src/lib/libzpool/Makefile.com
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright 2017 Joyent, Inc.
 #
 
 LIBRARY= libzpool.a
@@ -46,7 +47,7 @@ SRCDIR=		../common
 # There should be a mapfile here
 MAPFILES =
 
-LIBS +=		$(LINTLIB)
+LIBS +=		$(LINTLIB) $(DYNLIB)
 
 INCS += -I../common
 INCS += -I../../../uts/common/fs/zfs
diff --git a/usr/src/tools/findunref/exception_list.common b/usr/src/tools/findunref/exception_list.common
index ed97eed2ee..dca4a0986b 100644
--- a/usr/src/tools/findunref/exception_list.common
+++ b/usr/src/tools/findunref/exception_list.common
@@ -51,14 +51,6 @@
 */TODO
 
 #
-# Ignore warlock-related goop; not used during a nightly.
-#
-*.wlc
-*.wlcmd
-*/wlcmd
-*/warlock
-
-#
 # Ignore internal test directories and test programs.
 #
 */tests
diff --git a/usr/src/tools/findunref/exception_list.open b/usr/src/tools/findunref/exception_list.open
index 7a17be4241..8cb26d66f5 100644
--- a/usr/src/tools/findunref/exception_list.open
+++ b/usr/src/tools/findunref/exception_list.open
@@ -194,7 +194,7 @@
 ./usr/src/cmd/sendmail/src/statusd_shm.h
 
 #
-# Ignore files originally supplied by ISC (Internet Software Consortium) 
+# Ignore files originally supplied by ISC (Internet Software Consortium)
 # as part of a BIND release.
 #
 ./usr/src/lib/libresolv2/common/irs/getaddrinfo.c
@@ -209,15 +209,6 @@
 ./usr/src/common/bignum/mont_mulf.c
 
 #
-# Ignore the sparc Makefiles for x86-only drivers;
-# they're used to build warlock only.
-#
-./usr/src/uts/sparc/sata/Makefile
-./usr/src/uts/sparc/si3124/Makefile
-./usr/src/uts/sparc/nv_sata/Makefile
-./usr/src/uts/sparc/ahci/Makefile
-
-#
 # Ignore uttrack.c.  It is provided as part of the standard
 # ACPI CA source code but provides optional resource tracking
 # functionality which is not used.
diff --git a/usr/src/uts/common/fs/nfs/nfs4_callback.c b/usr/src/uts/common/fs/nfs/nfs4_callback.c
index d61c5fd253..729c8658fe 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_callback.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_callback.c
@@ -169,7 +169,7 @@ static void nfs4delegreturn_cleanup_impl(rnode4_t *, nfs4_server_t *,
 
 static void
 cb_getattr(nfs_cb_argop4 *argop, nfs_cb_resop4 *resop, struct svc_req *req,
-	struct compound_state *cs, struct nfs4_callback_globals *ncg)
+    struct compound_state *cs, struct nfs4_callback_globals *ncg)
 {
 	CB_GETATTR4args *args = &argop->nfs_cb_argop4_u.opcbgetattr;
 	CB_GETATTR4res *resp = &resop->nfs_cb_resop4_u.opcbgetattr;
@@ -382,7 +382,7 @@ cb_getattr_free(nfs_cb_resop4 *resop)
 
 static void
 cb_recall(nfs_cb_argop4 *argop, nfs_cb_resop4 *resop, struct svc_req *req,
-	struct compound_state *cs, struct nfs4_callback_globals *ncg)
+    struct compound_state *cs, struct nfs4_callback_globals *ncg)
 {
 	CB_RECALL4args * args = &argop->nfs_cb_argop4_u.opcbrecall;
 	CB_RECALL4res *resp = &resop->nfs_cb_resop4_u.opcbrecall;
@@ -536,7 +536,7 @@ cb_null(CB_COMPOUND4args *args, CB_COMPOUND4res *resp, struct svc_req *req,
 /* ARGSUSED */
 static void
 cb_illegal(nfs_cb_argop4 *argop, nfs_cb_resop4 *resop, struct svc_req *req,
-	struct compound_state *cs, struct nfs4_callback_globals *ncg)
+    struct compound_state *cs, struct nfs4_callback_globals *ncg)
 {
 	CB_ILLEGAL4res *resp = &resop->nfs_cb_resop4_u.opcbillegal;
 
@@ -547,7 +547,7 @@ cb_illegal(nfs_cb_argop4 *argop, nfs_cb_resop4 *resop, struct svc_req *req,
 
 static void
 cb_compound(CB_COMPOUND4args *args, CB_COMPOUND4res *resp, struct svc_req *req,
-	struct nfs4_callback_globals *ncg)
+    struct nfs4_callback_globals *ncg)
 {
 	uint_t i;
 	struct compound_state cs;
@@ -806,7 +806,7 @@ nfs4callback_destroy(nfs4_server_t *np)
  */
 static void
 nfs4_setport(char *netid, char *uaddr, char *protofmly, char *proto,
-	struct nfs4_callback_globals *ncg)
+    struct nfs4_callback_globals *ncg)
 {
 	struct nfs4_cb_port *p;
 	bool_t found = FALSE;
@@ -1290,7 +1290,7 @@ nfs4_callback_fini(void)
  */
 static void
 nfs4delegreturn_cleanup_impl(rnode4_t *rp, nfs4_server_t *np,
-	struct nfs4_callback_globals *ncg)
+    struct nfs4_callback_globals *ncg)
 {
 	mntinfo4_t *mi = VTOMI4(RTOV4(rp));
 	boolean_t need_rele = B_FALSE;
@@ -1373,7 +1373,7 @@ nfs4delegreturn_cleanup(rnode4_t *rp, nfs4_server_t *np)
 
 static void
 nfs4delegreturn_save_lost_rqst(int error, nfs4_lost_rqst_t *lost_rqstp,
-	cred_t *cr, vnode_t *vp)
+    cred_t *cr, vnode_t *vp)
 {
 	if (error != ETIMEDOUT && error != EINTR &&
 	    !NFS4_FRC_UNMT_ERR(error, vp->v_vfsp)) {
@@ -1439,12 +1439,12 @@ nfs4delegreturn_otw(rnode4_t *rp, cred_t *cr, nfs4_error_t *ep)
 		nfs4_attr_cache(RTOV4(rp), garp, t, cr, TRUE, NULL);
 
 	}
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 }
 
 int
 nfs4_do_delegreturn(rnode4_t *rp, int flags, cred_t *cr,
-	struct nfs4_callback_globals *ncg)
+    struct nfs4_callback_globals *ncg)
 {
 	vnode_t *vp = RTOV4(rp);
 	mntinfo4_t *mi = VTOMI4(vp);
@@ -1536,7 +1536,7 @@ nfs4_do_delegreturn(rnode4_t *rp, int flags, cred_t *cr,
  */
 void
 nfs4_resend_delegreturn(nfs4_lost_rqst_t *lorp, nfs4_error_t *ep,
-	nfs4_server_t *np)
+    nfs4_server_t *np)
 {
 	rnode4_t *rp = VTOR4(lorp->lr_vp);
 
@@ -1879,7 +1879,7 @@ nfs4_deleg_discard(mntinfo4_t *mi, nfs4_server_t *sp)
 
 static int
 deleg_reopen(vnode_t *vp, bool_t *recovp, struct nfs4_callback_globals *ncg,
-	int flags)
+    int flags)
 {
 	nfs4_open_stream_t *osp;
 	nfs4_recov_state_t recov_state;
@@ -2151,7 +2151,7 @@ out:
  */
 void
 nfs4_delegation_accept(rnode4_t *rp, open_claim_type4 claim, OPEN4res *res,
-	nfs4_ga_res_t *garp, cred_t *cr)
+    nfs4_ga_res_t *garp, cred_t *cr)
 {
 	open_read_delegation4 *orp;
 	open_write_delegation4 *owp;
@@ -2385,7 +2385,7 @@ nfs4delegabandon(rnode4_t *rp)
 
 static int
 wait_for_recall1(vnode_t *vp, nfs4_op_hint_t op, nfs4_recov_state_t *rsp,
-	int flg)
+    int flg)
 {
 	rnode4_t *rp;
 	int error = 0;
@@ -2426,7 +2426,7 @@ nfs4_end_op_recall(vnode_t *vp1, vnode_t *vp2, nfs4_recov_state_t *rsp)
 
 int
 wait_for_recall(vnode_t *vp1, vnode_t *vp2, nfs4_op_hint_t op,
-	nfs4_recov_state_t *rsp)
+    nfs4_recov_state_t *rsp)
 {
 	int error;
 
diff --git a/usr/src/uts/common/fs/nfs/nfs4_client.c b/usr/src/uts/common/fs/nfs/nfs4_client.c
index 3d231c7e6c..1734853f57 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_client.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_client.c
@@ -924,13 +924,13 @@ nfs4_getattr_otw_norecovery(vnode_t *vp, nfs4_ga_res_t *garp,
 		return;
 
 	if (res.status != NFS4_OK) {
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return;
 	}
 
 	*garp = res.array[1].nfs_resop4_u.opgetattr.ga_res;
 
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 }
 
 /*
@@ -1040,7 +1040,7 @@ recov_retry:
 		nfs4_end_fop(VTOMI4(vp), vp, NULL, OH_GETATTR, &recov_state,
 		    needrecov);
 		if (!e.error) {
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			e.error = geterrno4(res.status);
 		}
 		if (abort == FALSE)
@@ -1061,7 +1061,7 @@ recov_retry:
 			    ga_res.n4g_ext_res,
 			    garp->n4g_ext_res, sizeof (nfs4_ga_ext_res_t));
 	}
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 	nfs4_end_fop(VTOMI4(vp), vp, NULL, OH_GETATTR, &recov_state,
 	    needrecov);
 	return (e.error);
@@ -3521,7 +3521,7 @@ recov_retry:
 	    after_time.tv_sec, after_time.tv_nsec));
 
 	if (e.error == 0 && res.status == NFS4ERR_CB_PATH_DOWN) {
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		nfs4_delegreturn_all(sp);
 		nfs4_end_op(mi, NULL, NULL, &recov_state, needrecov);
 		VFS_RELE(mi->mi_vfsp);
@@ -3552,8 +3552,7 @@ recov_retry:
 			nfs4_end_op(mi, NULL, NULL, &recov_state, needrecov);
 			VFS_RELE(mi->mi_vfsp);
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			mutex_enter(&sp->s_lock);
 			goto recov_retry;
 		}
@@ -3572,7 +3571,7 @@ recov_retry:
 	}
 
 	if (!rpc_error)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 	nfs4_end_op(mi, NULL, NULL, &recov_state, needrecov);
 
diff --git a/usr/src/uts/common/fs/nfs/nfs4_client_secinfo.c b/usr/src/uts/common/fs/nfs/nfs4_client_secinfo.c
index ed2c2c167a..a9bfca9fd6 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_client_secinfo.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_client_secinfo.c
@@ -486,7 +486,7 @@ retry:
 	}
 
 	if (res.status == NFS4ERR_WRONGSEC) {
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		if (secinfo_check(mi->mi_curr_serv))
 			goto retry;
 		/*
@@ -502,12 +502,12 @@ retry:
 		    "secinfo_tryroot_otw: let the caller retry\n"));
 
 		if (!e.error)
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return (0);
 	}
 
 	if (res.status) {
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return (geterrno4(res.status));
 	}
 
@@ -518,7 +518,7 @@ retry:
 	 * SV4_TRYSECINFO has been cleared in rfs4call.
 	 * sv_currsec will be used.
 	 */
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 	return (e.error);
 }
 
@@ -702,7 +702,7 @@ retry:
 			nfs4args_lookup_free(argop, num_argops);
 			kmem_free(argop,
 			    lookuparg.arglen * sizeof (nfs_argop4));
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			kmem_free(tmp_path, path_len + 1);
 
 			if (e.error = secinfo_tryroot_otw(mi, cr)) {
@@ -713,7 +713,7 @@ retry:
 		ncomp = res.array_len - 1;
 		nfs4args_lookup_free(argop, num_argops);
 		kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		kmem_free(tmp_path, path_len + 1);
 		goto retry;
 	}
@@ -732,8 +732,7 @@ retry:
 		if (!isrecov) {
 			if (!e.error) {
 				e.error = geterrno4(res.status);
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			}
 
 			nfs4args_lookup_free(argop, num_argops);
@@ -750,7 +749,7 @@ retry:
 		    NULL, NULL, NULL, OP_SECINFO, NULL, NULL, NULL);
 		if (!e.error) {
 			e.error = geterrno4(res.status);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		}
 		nfs4args_lookup_free(argop, num_argops);
 		kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
@@ -768,7 +767,7 @@ retry:
 	if (res.status) {
 		nfs4args_lookup_free(argop, num_argops);
 		kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		kmem_free(tmp_path, path_len + 1);
 		return (geterrno4(res.status));
 	}
@@ -787,7 +786,7 @@ retry:
 		 */
 		nfs4args_lookup_free(argop, num_argops);
 		kmem_free(tmp_path, path_len + 1);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		kmem_free(argop, num_argops * sizeof (nfs_argop4));
 		return (EACCES);
 	}
@@ -804,7 +803,7 @@ retry:
 		 */
 		nfs4args_lookup_free(argop, num_argops);
 		kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		kmem_free(tmp_path, path_len + 1);
 		return (EACCES);
 	}
@@ -819,7 +818,7 @@ retry:
 		ncomp = tcomp;
 		nfs4args_lookup_free(argop, num_argops);
 		kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		kmem_free(tmp_path, path_len + 1);
 		goto retry;
 	}
@@ -827,7 +826,7 @@ retry:
 	/* Done! */
 	nfs4args_lookup_free(argop, num_argops);
 	kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 	kmem_free(tmp_path, path_len + 1);
 
 	return (0); /* got the secinfo */
@@ -943,7 +942,7 @@ nfs4_secinfo_fh_otw(mntinfo4_t *mi, nfs4_sharedfh_t *fh, char *nm, cred_t *cr)
 		return (e.error);
 
 	if (res.status) {
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return (geterrno4(res.status));
 	}
 
@@ -958,7 +957,7 @@ nfs4_secinfo_fh_otw(mntinfo4_t *mi, nfs4_sharedfh_t *fh, char *nm, cred_t *cr)
 		 * Server does not return any flavor for this export point.
 		 * Return EACCES.
 		 */
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return (EACCES);
 	}
 
@@ -973,13 +972,13 @@ nfs4_secinfo_fh_otw(mntinfo4_t *mi, nfs4_sharedfh_t *fh, char *nm, cred_t *cr)
 		 * the client does not have netname/syncaddr data
 		 * from sv_dhsec.
 		 */
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return (EACCES);
 	}
 	nfs_rw_exit(&svp->sv_lock);
 
 	/* Done! */
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 	return (0); /* got the secinfo */
 }
diff --git a/usr/src/uts/common/fs/nfs/nfs4_client_state.c b/usr/src/uts/common/fs/nfs/nfs4_client_state.c
index d8e79a9f4a..8b082582d6 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_client_state.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_client_state.c
@@ -1964,7 +1964,7 @@ cred_retry:
 		cred_otw = cr;
 		crhold(cred_otw);
 		if (!ep->error)
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		goto cred_retry;
 	}
 
@@ -1998,7 +1998,7 @@ cred_retry:
 	}
 
 	if (!ep->error)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 no_args_out:
 	crfree(cred_otw);
@@ -2247,8 +2247,7 @@ nfs4_resend_open_otw(vnode_t **vpp, nfs4_lost_rqst_t *resend_rqstp,
 				nfs4_end_open_seqid_sync(oop);
 				kmem_free(destcfp, destclen + 1);
 				nfs4args_copen_free(open_args);
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 				nfs_rw_exit(&mi->mi_fh_lock);
 				nfs4_fail_recov(vp, failed_msg, ep->error,
 				    ep->stat);
@@ -2279,7 +2278,7 @@ nfs4_resend_open_otw(vnode_t **vpp, nfs4_lost_rqst_t *resend_rqstp,
 					nfs4_end_open_seqid_sync(oop);
 					kmem_free(destcfp, destclen + 1);
 					nfs4args_copen_free(open_args);
-					(void) xdr_free(xdr_COMPOUND4res_clnt,
+					xdr_free(xdr_COMPOUND4res_clnt,
 					    (caddr_t)&res);
 					nfs_rw_exit(&mi->mi_fh_lock);
 					nfs4_fail_recov(vp, failed_msg,
@@ -2319,7 +2318,7 @@ nfs4_resend_open_otw(vnode_t **vpp, nfs4_lost_rqst_t *resend_rqstp,
 		kmem_free(destcfp, destclen + 1);
 		nfs4args_copen_free(open_args);
 		if (!ep->error)
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return;
 	}
 
@@ -2390,7 +2389,7 @@ nfs4_resend_open_otw(vnode_t **vpp, nfs4_lost_rqst_t *resend_rqstp,
 	else
 		PURGE_ATTRCACHE4(vp);
 
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 	ASSERT(nfs4_consistent_type(vp));
 
@@ -2401,5 +2400,5 @@ err_out:
 	kmem_free(destcfp, destclen + 1);
 	nfs4args_copen_free(open_args);
 	if (!ep->error)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 }
diff --git a/usr/src/uts/common/fs/nfs/nfs4_srv_deleg.c b/usr/src/uts/common/fs/nfs/nfs4_srv_deleg.c
index 445a6d2e3a..bb3f1bdd95 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_srv_deleg.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_srv_deleg.c
@@ -744,7 +744,7 @@ rfs4freeargres(CB_COMPOUND4args *args, CB_COMPOUND4res *resp)
 
 	kmem_free(args->array, arglen * sizeof (nfs_cb_argop4));
 	if (resp)
-		(void) xdr_free(xdr_CB_COMPOUND4res, (caddr_t)resp);
+		xdr_free(xdr_CB_COMPOUND4res, (caddr_t)resp);
 }
 
 /*
diff --git a/usr/src/uts/common/fs/nfs/nfs4_stub_vnops.c b/usr/src/uts/common/fs/nfs/nfs4_stub_vnops.c
index c937257550..de0d81dba4 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_stub_vnops.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_stub_vnops.c
@@ -455,7 +455,7 @@ nfs4_trigger_getattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr,
 
 static int
 nfs4_trigger_setattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr,
-		caller_context_t *ct)
+    caller_context_t *ct)
 {
 	int error;
 	vnode_t *newvp;
@@ -1506,7 +1506,7 @@ nfs4_fetch_locations(mntinfo4_t *mi, nfs4_sharedfh_t *sfh, char *nm,
 exit:
 	if (retval == 0) {
 		/* the call was ok but failed validating the call results */
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 	} else {
 		ASSERT(callres != NULL);
 		*callres = res;
@@ -1548,7 +1548,7 @@ find_referral_stubvp(vnode_t *dvp, char *nm, cred_t *cr)
 	    &garp, &callres, FALSE) == 0)
 		return (NULL);
 	mnt_on_fileid = garp.n4g_mon_fid;
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&callres);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&callres);
 
 	/*
 	 * Build a fake filehandle from the dir FH and the mounted_on_fileid
@@ -1648,7 +1648,7 @@ nfs4_process_referral(mntinfo4_t *mi, nfs4_sharedfh_t *sfh,
 		DTRACE_PROBE3(nfs4clnt__debug__referral__migration,
 		    mntinfo4_t *, mi, nfs4_ga_res_t *, &garp,
 		    char *, "nfs4_process_referral");
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&callres);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&callres);
 		return (-1);
 	}
 
@@ -1675,14 +1675,14 @@ nfs4_process_referral(mntinfo4_t *mi, nfs4_sharedfh_t *sfh,
 		    sockaddr_in *, (struct sockaddr_in *)nfsfsloc.addr->buf,
 		    char *, "nfs4_process_referral");
 
-		(void) xdr_free(xdr_nfs_fsl_info, (char *)&nfsfsloc);
+		xdr_free(xdr_nfs_fsl_info, (char *)&nfsfsloc);
 	}
 	knc = nfsfsloc.knconf;
 	if ((i >= garp.n4g_ext_res->n4g_fslocations.locations_len) ||
 	    (knc->knc_protofmly == NULL) || (knc->knc_proto == NULL)) {
 		DTRACE_PROBE2(nfs4clnt__debug__referral__nofsloc,
 		    nfs4_ga_res_t *, &garp, char *, "nfs4_process_referral");
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&callres);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&callres);
 		return (-1);
 	}
 
@@ -1813,8 +1813,8 @@ nfs4_trigger_esi_create_referral(vnode_t *vp, cred_t *cr)
 	kmem_free(p, MAXPATHLEN);
 
 	/* Allocated in nfs4_process_referral() */
-	(void) xdr_free(xdr_nfs_fsl_info, (char *)&nfsfsloc);
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&callres);
+	xdr_free(xdr_nfs_fsl_info, (char *)&nfsfsloc);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&callres);
 
 	return (esi);
 err:
@@ -1827,8 +1827,8 @@ err:
 	kmem_free(esi->esi_knconf, sizeof (*esi->esi_knconf));
 	kmem_free(esi->esi_netname, nfsfsloc.netnm_len);
 	kmem_free(esi, sizeof (ephemeral_servinfo_t));
-	(void) xdr_free(xdr_nfs_fsl_info, (char *)&nfsfsloc);
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&callres);
+	xdr_free(xdr_nfs_fsl_info, (char *)&nfsfsloc);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&callres);
 	return (NULL);
 }
 
diff --git a/usr/src/uts/common/fs/nfs/nfs4_subr.c b/usr/src/uts/common/fs/nfs/nfs4_subr.c
index 991217ff5f..ec5fda53a0 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_subr.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_subr.c
@@ -1774,7 +1774,7 @@ exit:
 	kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
 
 	if (!ep->error)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 	kmem_free(path, strlen(path)+1);
 }
 
diff --git a/usr/src/uts/common/fs/nfs/nfs4_vfsops.c b/usr/src/uts/common/fs/nfs/nfs4_vfsops.c
index 55f6c95289..ed4a5f55aa 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_vfsops.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_vfsops.c
@@ -263,7 +263,8 @@ nfs4fini(void)
  */
 static struct sec_data *
 create_authdh_data(char *netname, int nlen, struct netbuf *syncaddr,
-		struct knetconfig *knconf) {
+    struct knetconfig *knconf)
+{
 	struct sec_data *secdata;
 	dh_k4_clntdata_t *data;
 	char *pf, *p;
@@ -311,7 +312,8 @@ create_authdh_data(char *netname, int nlen, struct netbuf *syncaddr,
  * is responsible for freeing.
  */
 sec_data_t *
-copy_sec_data(sec_data_t *fsecdata) {
+copy_sec_data(sec_data_t *fsecdata)
+{
 	sec_data_t *tsecdata;
 
 	if (fsecdata == NULL)
@@ -1286,8 +1288,7 @@ recov_retry:
 		    OP_READLINK, NULL, NULL, NULL) == FALSE) {
 			nfs4_end_op(mi, NULL, NULL, &recov_state, needrecov);
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		}
 	}
@@ -1304,7 +1305,7 @@ recov_retry:
 
 	if (res.status) {
 		e.error = geterrno4(res.status);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		if (! recovery)
 			nfs4_end_op(mi, NULL, NULL, &recov_state, needrecov);
 		sfh4_rele(&sfh);
@@ -1323,7 +1324,7 @@ recov_retry:
 	if (! recovery)
 		nfs4_end_op(mi, NULL, NULL, &recov_state, needrecov);
 	sfh4_rele(&sfh);
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 	return (0);
 }
 
@@ -1801,8 +1802,7 @@ recov_retry:
 			kmem_free(argop,
 			    lookuparg.arglen * sizeof (nfs_argop4));
 			if (!ep->error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			return;
 		}
 
@@ -1813,7 +1813,7 @@ recov_retry:
 		    NULL, NULL, NULL, OP_GETFH, NULL, NULL, NULL);
 		if (!ep->error) {
 			ep->error = geterrno4(res.status);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		}
 		nfs4args_lookup_free(argop, num_argops);
 		kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
@@ -1847,7 +1847,7 @@ is_link_err:
 		}
 		nfs4args_lookup_free(argop, num_argops);
 		kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return;
 	}
 
@@ -1902,7 +1902,7 @@ is_link_err:
 
 		nfs4args_lookup_free(argop, num_argops);
 		kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 		if (ep->error)
 			return;
@@ -1985,7 +1985,7 @@ is_link_err:
 
 		nfs4args_lookup_free(argop, num_argops);
 		kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 		if (ep->error)
 			return;
@@ -2034,7 +2034,7 @@ is_link_err:
 	nfs_rw_exit(&svp->sv_lock);
 	nfs4args_lookup_free(argop, num_argops);
 	kmem_free(argop, lookuparg.arglen * sizeof (nfs_argop4));
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 	if (!recovery)
 		nfs4_end_fop(mi, NULL, NULL, OH_MOUNT, &recov_state, needrecov);
 }
@@ -3518,12 +3518,12 @@ nfs4setclientid_otw(mntinfo4_t *mi, struct servinfo4 *svp,  cred_t *cr,
 		 * handling of clientid in use errors (regen another
 		 * clientid and try again?)
 		 */
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return;
 	}
 
 	if (res.status) {
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return;
 	}
 
@@ -3549,7 +3549,7 @@ nfs4setclientid_otw(mntinfo4_t *mi, struct servinfo4 *svp,  cred_t *cr,
 	}
 #endif
 
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 	/* Confirm the client id and get the lease_time attribute */
 
@@ -3602,12 +3602,12 @@ nfs4setclientid_otw(mntinfo4_t *mi, struct servinfo4 *svp,  cred_t *cr,
 			    clid_inuse->r_netid, clid_inuse->r_addr);
 		}
 
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return;
 	}
 
 	if (res.status) {
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return;
 	}
 
@@ -3630,7 +3630,7 @@ nfs4setclientid_otw(mntinfo4_t *mi, struct servinfo4 *svp,  cred_t *cr,
 	}
 	mutex_exit(&np->s_lock);
 
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 }
 
 /*
diff --git a/usr/src/uts/common/fs/nfs/nfs4_vnops.c b/usr/src/uts/common/fs/nfs/nfs4_vnops.c
index 04b85265cb..945d37533d 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_vnops.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_vnops.c
@@ -1215,7 +1215,7 @@ recov_retry:
 			nfs4args_setattr_free(&argop[9]);
 		}
 		if (!e.error)
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		if (ncr != NULL) {
 			crfree(ncr);
 			ncr = NULL;
@@ -1257,7 +1257,7 @@ recov_retry:
 			nfs4args_verify_free(&argop[8]);
 			nfs4args_setattr_free(&argop[9]);
 		}
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		nfs4_end_op(VTOMI4(dvp), dvp, vpi, &recov_state, needrecov);
 		/*
 		 * If the reply is NFS4ERR_ACCESS, it may be because
@@ -1360,7 +1360,7 @@ recov_retry:
 				nfs4args_verify_free(&argop[8]);
 				nfs4args_setattr_free(&argop[9]);
 			}
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			nfs4_end_op(VTOMI4(dvp), dvp, vpi, &recov_state,
 			    needrecov);
 			open_owner_rele(oop);
@@ -1400,7 +1400,7 @@ recov_retry:
 				nfs4args_verify_free(&argop[8]);
 				nfs4args_setattr_free(&argop[9]);
 			}
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			nfs4_end_op(VTOMI4(dvp), dvp, vpi, &recov_state,
 			    needrecov);
 			open_owner_rele(oop);
@@ -1469,7 +1469,7 @@ recov_retry:
 			nfs4args_verify_free(&argop[8]);
 			nfs4args_setattr_free(&argop[9]);
 		}
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		nfs4_end_op(VTOMI4(dvp), dvp, vpi, &recov_state, needrecov);
 		if (create_flag || fh_differs)
 			VN_RELE(vp);
@@ -1635,7 +1635,7 @@ skip_update_dircaches:
 		nfs4args_verify_free(&argop[8]);
 		nfs4args_setattr_free(&argop[9]);
 	}
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 	if (ncr)
 		crfree(ncr);
@@ -1952,7 +1952,7 @@ top:
 		    NULL, OP_OPEN, bsep, NULL, NULL);
 
 		nfs4args_copen_free(open_args);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		nfs4_end_open_seqid_sync(oop);
 		open_owner_rele(oop);
 		oop = NULL;
@@ -1961,7 +1961,7 @@ top:
 		goto kill_file;
 	case NFS4ERR_NO_GRACE:
 		nfs4args_copen_free(open_args);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		nfs4_end_open_seqid_sync(oop);
 		open_owner_rele(oop);
 		oop = NULL;
@@ -1985,7 +1985,7 @@ top:
 	case NFS4ERR_GRACE:
 		nfs4_set_grace_wait(mi);
 		nfs4args_copen_free(open_args);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		nfs4_end_open_seqid_sync(oop);
 		open_owner_rele(oop);
 		oop = NULL;
@@ -1996,7 +1996,7 @@ top:
 	case NFS4ERR_DELAY:
 		nfs4_set_delay_wait(vp);
 		nfs4args_copen_free(open_args);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		nfs4_end_open_seqid_sync(oop);
 		open_owner_rele(oop);
 		oop = NULL;
@@ -2010,7 +2010,7 @@ top:
 		abort = nfs4_start_recovery(ep,
 		    mi, vp, NULL, NULL, NULL, OP_OPEN, NULL, NULL, NULL);
 		nfs4args_copen_free(open_args);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		nfs4_end_open_seqid_sync(oop);
 		open_owner_rele(oop);
 		oop = NULL;
@@ -2027,7 +2027,7 @@ top:
 		 * function initiate recovery.
 		 */
 		nfs4args_copen_free(open_args);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		nfs4_end_open_seqid_sync(oop);
 		open_owner_rele(oop);
 		oop = NULL;
@@ -2038,7 +2038,7 @@ top:
 			cred_otw = cr;
 			crhold(cred_otw);
 			nfs4args_copen_free(open_args);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			nfs4_end_open_seqid_sync(oop);
 			open_owner_rele(oop);
 			oop = NULL;
@@ -2052,7 +2052,7 @@ top:
 		    rnode4info(VTOR4(vp))));
 		failed_msg = "Couldn't reopen: NFSv4 error";
 		nfs4args_copen_free(open_args);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		goto kill_file;
 	}
 
@@ -2082,7 +2082,7 @@ top:
 				    "(no expire on open) file handle changed";
 
 			nfs4args_copen_free(open_args);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			nfs_rw_exit(&mi->mi_fh_lock);
 			goto kill_file;
 
@@ -2108,7 +2108,7 @@ top:
 				    "Couldn't reopen: file handle changed"
 				    " due to mismatched fids";
 				nfs4args_copen_free(open_args);
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
+				xdr_free(xdr_COMPOUND4res_clnt,
 				    (caddr_t)&res);
 				nfs_rw_exit(&mi->mi_fh_lock);
 				goto kill_file;
@@ -2149,7 +2149,7 @@ top:
 		    oop, FALSE, ep, NULL);
 		if (ep->error || ep->stat) {
 			nfs4args_copen_free(open_args);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			nfs4_end_open_seqid_sync(oop);
 			open_owner_rele(oop);
 			oop = NULL;
@@ -2181,7 +2181,7 @@ top:
 
 	nfs4_attr_cache(vp, garp, t, cr, TRUE, NULL);
 
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 	ASSERT(nfs4_consistent_type(vp));
 
@@ -2549,12 +2549,12 @@ nfs4close_otw(rnode4_t *rp, cred_t *cred_otw, nfs4_open_owner_t *oop,
 			*recov = 0;
 
 		if (!ep->error)
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return;
 	}
 
 	if (res.status) {
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return;
 	}
 
@@ -2596,7 +2596,7 @@ nfs4close_otw(rnode4_t *rp, cred_t *cred_otw, nfs4_open_owner_t *oop,
 	NFS4_DEBUG(nfs4_client_state_debug, (CE_NOTE, "nfs4close_otw:"
 	    " returning %d", ep->error));
 
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 }
 
 /* ARGSUSED */
@@ -3268,7 +3268,7 @@ recov_retry:
 			if (!recov)
 				nfs4_end_fop(VTOMI4(vp), vp, NULL, OH_WRITE,
 				    &recov_state, needrecov);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		} else if (e.error == 0 && res.status == NFS4ERR_BAD_STATEID &&
 		    sid_types.cur_sid_type == DEL_SID) {
@@ -3280,8 +3280,7 @@ recov_retry:
 				if (!recov)
 					nfs4_end_fop(mi, vp, NULL, OH_WRITE,
 					    &recov_state, needrecov);
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 				return (EIO);
 			}
 			if (!recov)
@@ -3291,7 +3290,7 @@ recov_retry:
 			VN_HOLD(vp);
 			nfs4delegreturn_async(rp, (NFS4_DR_PUSH|NFS4_DR_REOPEN|
 			    NFS4_DR_DISCARD), FALSE);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		}
 
@@ -3307,8 +3306,7 @@ recov_retry:
 			    NULL, OP_WRITE, NULL, NULL, NULL);
 			if (!e.error) {
 				e.error = geterrno4(res.status);
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			}
 			nfs4_end_fop(VTOMI4(vp), vp, NULL, OH_WRITE,
 			    &recov_state, needrecov);
@@ -3319,7 +3317,7 @@ recov_retry:
 
 		if (res.status) {
 			e.error = geterrno4(res.status);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			if (!recov)
 				nfs4_end_fop(VTOMI4(vp), vp, NULL, OH_WRITE,
 				    &recov_state, needrecov);
@@ -3330,7 +3328,7 @@ recov_retry:
 		wres = &resop->nfs_resop4_u.opwrite;
 
 		if ((int)wres->count > tsize) {
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 			zcmn_err(getzoneid(), CE_WARN,
 			    "nfs4write: server wrote %u, requested was %u",
@@ -3344,8 +3342,7 @@ recov_retry:
 			*stab_comm = UNSTABLE4;
 			if (wargs->stable == DATA_SYNC4 ||
 			    wargs->stable == FILE_SYNC4) {
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 				zcmn_err(getzoneid(), CE_WARN,
 				    "nfs4write: server %s did not commit "
 				    "to stable storage",
@@ -3384,7 +3381,7 @@ recov_retry:
 		gethrestime(&rp->r_attr.va_mtime);
 		rp->r_attr.va_ctime = rp->r_attr.va_mtime;
 		mutex_exit(&rp->r_statelock);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 	} while (count);
 
 	if (!recov)
@@ -3521,19 +3518,18 @@ recov_retry:
 			nfs4_end_fop(mi, vp, NULL, OH_READ,
 			    &recov_state, needrecov);
 			if (sid_types.cur_sid_type == SPEC_SID) {
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 				return (EIO);
 			}
 			nfs4_save_stateid(&rargs->stateid, &sid_types);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		} else if (e.error == 0 && res.status == NFS4ERR_OLD_STATEID &&
 		    !async && sid_types.cur_sid_type != SPEC_SID) {
 			nfs4_save_stateid(&rargs->stateid, &sid_types);
 			nfs4_end_fop(mi, vp, NULL, OH_READ,
 			    &recov_state, needrecov);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		} else if (e.error == 0 && res.status == NFS4ERR_BAD_STATEID &&
 		    sid_types.cur_sid_type == DEL_SID) {
@@ -3544,8 +3540,7 @@ recov_retry:
 			if (nfs4rdwr_check_osid(vp, &e, cr)) {
 				nfs4_end_fop(mi, vp, NULL, OH_READ,
 				    &recov_state, needrecov);
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 				return (EIO);
 			}
 			nfs4_end_fop(mi, vp, NULL, OH_READ,
@@ -3554,7 +3549,7 @@ recov_retry:
 			VN_HOLD(vp);
 			nfs4delegreturn_async(rp, (NFS4_DR_PUSH|NFS4_DR_REOPEN|
 			    NFS4_DR_DISCARD), FALSE);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		}
 		if (needrecov) {
@@ -3583,15 +3578,13 @@ recov_retry:
 				 * stale (server reboot).
 				 */
 				nfs4_init_stateid_types(&sid_types);
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 				goto recov_retry;
 			}
 
 			if (!e.error) {
 				e.error = geterrno4(res.status);
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			}
 			return (e.error);
 		}
@@ -3600,7 +3593,7 @@ recov_retry:
 			e.error = geterrno4(res.status);
 			nfs4_end_fop(mi, vp, NULL, OH_READ,
 			    &recov_state, needrecov);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			return (e.error);
 		}
 
@@ -3617,7 +3610,7 @@ recov_retry:
 		}
 		lwp_stat_update(LWP_STAT_INBLK, 1);
 		is_eof = res.array[1].nfs_resop4_u.opread.eof;
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 	} while (count && !is_eof);
 
@@ -4012,7 +4005,7 @@ recov_retry:
 				nfs4args_verify_free(&argop[verify_argop]);
 				verify_argop = -1;
 			}
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		}
 
@@ -4039,8 +4032,7 @@ recov_retry:
 					    OP_SETATTR);
 
 				e.error = geterrno4(res.status);
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			}
 			nfs4_fattr4_free(&argop[setattr_argop].nfs_argop4_u.
 			    opsetattr.obj_attributes);
@@ -4110,7 +4102,7 @@ recov_retry:
 			 * retry with a new verify value
 			 */
 			ctime = garp->n4g_va.va_ctime;
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			resp = NULL;
 		}
 		if (!e.error) {
@@ -4120,7 +4112,7 @@ recov_retry:
 				nfs4args_verify_free(&argop[verify_argop]);
 				verify_argop = -1;
 			}
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto do_again;
 		}
 	} while (!e.error);
@@ -4136,7 +4128,7 @@ recov_retry:
 			verify_argop = -1;
 		}
 		if (resp)
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
 		return (e.error);
 	}
 
@@ -4225,7 +4217,7 @@ recov_retry:
 		nfs4args_verify_free(&argop[verify_argop]);
 		verify_argop = -1;
 	}
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 	/*
 	 * Some servers will change the mode to clear the setuid
@@ -4417,8 +4409,7 @@ recov_retry:
 			nfs4_end_fop(VTOMI4(vp), vp, NULL, OH_ACCESS,
 			    &recov_state, needrecov);
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		}
 	}
@@ -4468,8 +4459,7 @@ recov_retry:
 			 */
 			/* XXX-LP */
 			if (ncr != NULL) {
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 				cred = ncr;
 				ncr = NULL;
 				goto tryagain;
@@ -4480,7 +4470,7 @@ recov_retry:
 
 out:
 	if (!rpc_error)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 	if (ncrfree != NULL)
 		crfree(ncrfree);
@@ -4572,8 +4562,7 @@ recov_retry:
 		if (nfs4_start_recovery(&e, VTOMI4(vp), vp, NULL, NULL,
 		    NULL, OP_READLINK, NULL, NULL, NULL) == FALSE) {
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 			nfs4_end_op(VTOMI4(vp), vp, NULL, &recov_state,
 			    needrecov);
@@ -4599,7 +4588,7 @@ recov_retry:
 		 */
 		e.error = geterrno4(res.status);
 		nfs4_purge_stale_fh(e.error, vp, cr);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return (e.error);
 	}
 
@@ -4635,7 +4624,7 @@ recov_retry:
 	}
 	e.error = nfs4_update_attrcache(res.status, garp, t, vp, cr);
 
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 	/*
 	 * The over the wire error for attempting to readlink something
@@ -4933,8 +4922,7 @@ recov_retry_remove:
 		if (nfs4_start_recovery(&e, VTOMI4(unldvp), unldvp, NULL,
 		    NULL, NULL, OP_REMOVE, NULL, NULL, NULL) == FALSE) {
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			nfs4_end_op(VTOMI4(unldvp), unldvp, NULL,
 			    &recov_state, TRUE);
 			goto recov_retry_remove;
@@ -4947,7 +4935,7 @@ recov_retry_remove:
 	 */
 	VN_RELE(unldvp);
 	if (!e.error && resp)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
 
 	kmem_free(unlname, MAXNAMELEN);
 	crfree(unlcred);
@@ -5356,7 +5344,7 @@ recov_retry:
 			VN_RELE(*vpp);
 		nfs4_end_fop(mi, dvp, NULL, OH_LOOKUP,
 		    &recov_state, FALSE);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		kmem_free(argop, argoplist_size);
 		return (e.error);
 	}
@@ -5377,7 +5365,7 @@ recov_retry:
 			else
 				nfs4_end_fop(mi, dvp, NULL, OH_LOOKUP,
 				    &recov_state, TRUE);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			kmem_free(argop, argoplist_size);
 			if (!e.error)
 				goto recov_retry;
@@ -5392,7 +5380,7 @@ recov_retry:
 			nfs4_end_fop(mi, dvp, NULL, OH_LOOKUP,
 			    &recov_state, TRUE);
 
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			kmem_free(argop, argoplist_size);
 			goto recov_retry;
 		}
@@ -5648,7 +5636,7 @@ recov_retry:
 	}
 
 exit:
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 	kmem_free(argop, argoplist_size);
 	(void) check_mnt_secinfo(mi->mi_curr_serv, nvp);
 	return (e.error);
@@ -5794,7 +5782,7 @@ recov_retry:
 			VN_RELE(*vpp);
 		nfs4_end_fop(mi, dvp, NULL, OH_LOOKUP,
 		    &recov_state, FALSE);
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		kmem_free(argop, argoplist_size);
 		return (e.error);
 	}
@@ -5815,7 +5803,7 @@ recov_retry:
 			else
 				nfs4_end_fop(mi, dvp, NULL, OH_LOOKUP,
 				    &recov_state, TRUE);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			kmem_free(argop, argoplist_size);
 			if (!e.error)
 				goto recov_retry;
@@ -5828,7 +5816,7 @@ recov_retry:
 			nfs4_end_fop(mi, dvp, NULL, OH_LOOKUP,
 			    &recov_state, TRUE);
 
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			kmem_free(argop, argoplist_size);
 			goto recov_retry;
 		}
@@ -6053,7 +6041,7 @@ recov_retry:
 	*vpp = nvp;
 
 exit:
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 	kmem_free(argop, argoplist_size);
 	(void) check_mnt_secinfo(mi->mi_curr_serv, nvp);
 	return (e.error);
@@ -6434,7 +6422,7 @@ recov_retry:
 		nfs4_end_op(VTOMI4(dvp), dvp, NULL, &recov_state, needrecov);
 		if (!e.error) {
 			e.error = geterrno4(res.status);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		}
 		if (abort == FALSE)
 			goto recov_retry;
@@ -6468,7 +6456,7 @@ recov_retry:
 		}
 
 		if (e.error) {
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			nfs4_end_op(VTOMI4(dvp), dvp, NULL, &recov_state,
 			    needrecov);
 			return (e.error);
@@ -6485,7 +6473,7 @@ recov_retry:
 	gf_res = &resop->nfs_resop4_u.opgetfh;
 	if (gf_res->object.nfs_fh4_len == 0) {
 		*avp = NULL;
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		nfs4_end_op(VTOMI4(dvp), dvp, NULL, &recov_state, needrecov);
 		return (ENOENT);
 	}
@@ -6523,7 +6511,7 @@ recov_retry:
 
 	nfs4_end_op(VTOMI4(dvp), dvp, NULL, &recov_state, needrecov);
 
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 	return (0);
 }
@@ -7055,7 +7043,7 @@ recov_retry:
 				nfs4args_verify_free(&argop[8]);
 				nfs4args_setattr_free(&argop[9]);
 			}
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		}
 	}
@@ -7157,7 +7145,7 @@ out:
 		nfs4args_setattr_free(&argop[9]);
 	}
 	if (resp)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
 	if (need_end_op)
 		nfs4_end_op(mi, dvp, NULL, &recov_state, needrecov);
 
@@ -7407,8 +7395,7 @@ recov_retry:
 		if (nfs4_start_recovery(&e, VTOMI4(dvp), dvp,
 		    NULL, NULL, NULL, OP_REMOVE, NULL, NULL, NULL) == FALSE) {
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			nfs4_end_op(VTOMI4(dvp), dvp, NULL, &recov_state,
 			    needrecov);
 			goto recov_retry;
@@ -7446,7 +7433,7 @@ recov_retry:
 	}
 	nfs_rw_exit(&drp->r_rwlock);
 	if (resp)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
 
 	if (e.error == 0) {
 		vnode_t *tvp;
@@ -7585,8 +7572,7 @@ recov_retry:
 			    needrecov);
 			kmem_free(argop, argoplist_size);
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		} else {
 			if (e.error != 0) {
@@ -7683,7 +7669,7 @@ recov_retry:
 out:
 	kmem_free(argop, argoplist_size);
 	if (resp)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
 
 	nfs_rw_exit(&tdrp->r_rwlock);
 
@@ -8248,8 +8234,7 @@ recov_retry:
 		    OP_RENAME, NULL, NULL, NULL) == FALSE) {
 			nfs4_end_op(mi, odvp, ndvp, &recov_state, needrecov);
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		}
 	}
@@ -8313,7 +8298,7 @@ recov_retry:
 	}
 
 	if (resp)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
 	nfs4_end_op(mi, odvp, ndvp, &recov_state, needrecov);
 	kmem_free(argop, argoplist_size);
 
@@ -8508,8 +8493,7 @@ recov_retry:
 			    &recov_state, needrecov);
 			kmem_free(argop, argoplist_size);
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			mutex_enter(&orp->r_statelock);
 			orp->r_flags &= ~R4RECEXPFH;
 			cv_broadcast(&orp->r_cv);
@@ -8607,7 +8591,7 @@ recov_retry:
 out:
 	kmem_free(argop, argoplist_size);
 	if (resp)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
 	mutex_enter(&orp->r_statelock);
 	orp->r_flags &= ~R4RECEXPFH;
 	cv_broadcast(&orp->r_cv);
@@ -8782,8 +8766,7 @@ recov_retry:
 		if (nfs4_start_recovery(&e, VTOMI4(dvp), dvp, NULL, NULL,
 		    NULL, OP_REMOVE, NULL, NULL, NULL) == FALSE) {
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 			nfs4_end_op(VTOMI4(dvp), dvp, NULL, &recov_state,
 			    needrecov);
@@ -8843,7 +8826,7 @@ recov_retry:
 	nfs_rw_exit(&drp->r_rwlock);
 
 	if (resp)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
 
 	if (e.error == 0) {
 		vnode_t *tvp;
@@ -9382,8 +9365,7 @@ recov_retry:
 			nfs4_end_fop(VTOMI4(vp), vp, NULL, OH_READDIR,
 			    &recov_state, needrecov);
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			if (rdc->entries != NULL) {
 				kmem_free(rdc->entries, rdc->entlen);
 				rdc->entries = NULL;
@@ -9428,7 +9410,7 @@ recov_retry:
 			    &recov_state, needrecov);
 			nfs4_purge_stale_fh(e.error, vp, cr);
 			rdc->error = e.error;
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			if (rdc->entries != NULL) {
 				kmem_free(rdc->entries, rdc->entlen);
 				rdc->entries = NULL;
@@ -9516,7 +9498,7 @@ recov_retry:
 		mutex_exit(&mi->mi_lock);
 	}
 
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 out:
 	/*
@@ -11818,8 +11800,7 @@ recov_retry:
 			nfs4_end_fop(VTOMI4(vp), vp, NULL, OH_COMMIT,
 			    &recov_state, needrecov);
 			if (!e.error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto recov_retry;
 		}
 		if (e.error) {
@@ -11839,7 +11820,7 @@ recov_retry:
 			crfree(cred_otw);
 			nfs4_end_fop(VTOMI4(vp), vp, NULL, OH_COMMIT,
 			    &recov_state, needrecov);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			goto get_commit_cred;
 		}
 		/*
@@ -11869,7 +11850,7 @@ recov_retry:
 		mutex_enter(&rp->r_statelock);
 		if (cm_res->writeverf == rp->r_writeverf) {
 			mutex_exit(&rp->r_statelock);
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 			nfs4_end_fop(VTOMI4(vp), vp, NULL, OH_COMMIT,
 			    &recov_state, needrecov);
 			crfree(cred_otw);
@@ -11883,7 +11864,7 @@ recov_retry:
 		e.error = NFS_VERF_MISMATCH;
 	}
 
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 	nfs4_end_fop(VTOMI4(vp), vp, NULL, OH_COMMIT, &recov_state, needrecov);
 	crfree(cred_otw);
 	if (osp != NULL)
@@ -12804,8 +12785,7 @@ recov_retry_confirm:
 		    res.status == NFS4ERR_RESOURCE) &&
 		    abort == FALSE && resend == FALSE) {
 			if (!ep->error)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
-				    (caddr_t)&res);
+				xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 
 			delay(SEC_TO_TICK(confirm_retry_sec));
 			goto recov_retry_confirm;
@@ -12816,12 +12796,12 @@ recov_retry_confirm:
 		else
 			*retry_open = FALSE;
 		if (!ep->error)
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return;
 	}
 
 	if (res.status) {
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 		return;
 	}
 
@@ -12829,7 +12809,7 @@ recov_retry_confirm:
 	bcopy(&resop->nfs_resop4_u.opopen_confirm.open_stateid,
 	    stateid, sizeof (*stateid));
 
-	(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
+	xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)&res);
 }
 
 /*
@@ -13626,7 +13606,7 @@ nfs4frlock_check_access(vnode_t *vp, nfs4_op_hint_t op_hint,
 		nfs4args_lockt_free(&argop[1]);
 	kmem_free(argop, 2 * sizeof (nfs_argop4));
 	if (!error)
-		(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)*respp);
+		xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)*respp);
 	*argspp = NULL;
 	*respp = NULL;
 
@@ -13754,7 +13734,7 @@ nfs4frlock_recovery(int needrecov, nfs4_error_t *ep,
 			nfs4args_lockt_free(&argop[1]);
 		kmem_free(argop, 2 * sizeof (nfs_argop4));
 		if (!ep->error)
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)*respp);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)*respp);
 		*respp = NULL;
 		*argspp = NULL;
 	}
@@ -13857,7 +13837,7 @@ nfs4frlock_results_denied(nfs4_lock_call_type_t ctype, LOCK4args *lock_args,
 				nfs4args_lockt_free(&argop[1]);
 			kmem_free(argop, 2 * sizeof (nfs_argop4));
 			if (*respp)
-				(void) xdr_free(xdr_COMPOUND4res_clnt,
+				xdr_free(xdr_COMPOUND4res_clnt,
 				    (caddr_t)*respp);
 			*argspp = NULL;
 			*respp = NULL;
@@ -14081,7 +14061,7 @@ nfs4frlock_final_cleanup(nfs4_lock_call_type_t ctype, COMPOUND4args_clnt *argsp,
 			nfs4args_lockt_free(&argop[1]);
 		kmem_free(argop, 2 * sizeof (nfs_argop4));
 		if (resp)
-			(void) xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
+			xdr_free(xdr_COMPOUND4res_clnt, (caddr_t)resp);
 	}
 
 	/* free the reference on the lock owner */
diff --git a/usr/src/uts/common/io/bnxe/577xx/drivers/common/include/debug.h b/usr/src/uts/common/io/bnxe/577xx/drivers/common/include/debug.h
index b1cc6f6850..7a1f47f775 100644
--- a/usr/src/uts/common/io/bnxe/577xx/drivers/common/include/debug.h
+++ b/usr/src/uts/common/io/bnxe/577xx/drivers/common/include/debug.h
@@ -879,8 +879,8 @@ void um_dbg_log_msg(void* ctx, char *file, char *function, unsigned long line, c
 #endif // !WIN_DIAG
 
 #define CHK_NULL(p) (p==NULL)
-#define ERR_IF(cond)(cond==TRUE)
-#define WRN_IF(cond)(cond==TRUE)
+#define ERR_IF(cond)((cond)==TRUE)
+#define WRN_IF(cond)((cond)==TRUE)
 
 #endif // !DBG
 
diff --git a/usr/src/uts/common/io/bnxe/577xx/hsi/mcp/shmem.h b/usr/src/uts/common/io/bnxe/577xx/hsi/mcp/shmem.h
index 3b79880145..7410e74214 100644
--- a/usr/src/uts/common/io/bnxe/577xx/hsi/mcp/shmem.h
+++ b/usr/src/uts/common/io/bnxe/577xx/hsi/mcp/shmem.h
@@ -1128,9 +1128,9 @@ struct shmem2_region {
 	#define SHMEM_EEE_SUPPORTED_MASK	   0x000f0000
 	#define SHMEM_EEE_SUPPORTED_SHIFT	   16
 	#define SHMEM_EEE_ADV_STATUS_MASK	   0x00f00000
-		#define SHMEM_EEE_100M_ADV	   (1<<0)
-		#define SHMEM_EEE_1G_ADV	   (1<<1)
-		#define SHMEM_EEE_10G_ADV	   (1<<2)
+		#define SHMEM_EEE_100M_ADV	   (1U<<0)
+		#define SHMEM_EEE_1G_ADV	   (1U<<1)
+		#define SHMEM_EEE_10G_ADV	   (1U<<2)
 	#define SHMEM_EEE_ADV_STATUS_SHIFT	   20
 	#define	SHMEM_EEE_LP_ADV_STATUS_MASK	   0x0f000000
 	#define SHMEM_EEE_LP_ADV_STATUS_SHIFT	   24
diff --git a/usr/src/uts/common/io/comstar/port/fcoet/fcoet.h b/usr/src/uts/common/io/comstar/port/fcoet/fcoet.h
index 8859d5eac8..b85f5886a1 100644
--- a/usr/src/uts/common/io/comstar/port/fcoet/fcoet.h
+++ b/usr/src/uts/common/io/comstar/port/fcoet/fcoet.h
@@ -293,10 +293,10 @@ void fcoet_modhash_find_cb(mod_hash_key_t, mod_hash_val_t);
 #define	PRT_FRM_HDR(x_p, x_f)						\
 	{								\
 		FCOET_LOG(x_p, "rctl/%x, type/%x, fctl/%x, oxid/%x",	\
-		    FCOE_B2V_1((x_f)->frm_hdr->hdr_r_ctl),		\
-		    FCOE_B2V_1((x_f)->frm_hdr->hdr_type),		\
-		    FCOE_B2V_3((x_f)->frm_hdr->hdr_f_ctl),		\
-		    FCOE_B2V_4((x_f)->frm_hdr->hdr_oxid));		\
+		    FRM_R_CTL(x_f),		\
+		    FRM_TYPE(x_f),		\
+		    FRM_F_CTL(x_f),		\
+		    FRM_OXID(x_f));		\
 	}
 
 #endif	/* _KERNEL */
diff --git a/usr/src/uts/common/io/comstar/port/fcoet/fcoet_fc.c b/usr/src/uts/common/io/comstar/port/fcoet/fcoet_fc.c
index 779751e69d..aef67b3fe9 100644
--- a/usr/src/uts/common/io/comstar/port/fcoet/fcoet_fc.c
+++ b/usr/src/uts/common/io/comstar/port/fcoet/fcoet_fc.c
@@ -785,7 +785,7 @@ fcoet_send_status(fct_cmd_t *cmd)
 	 * Fill fcp_rsp
 	 */
 	ffr = (fcoe_fcp_rsp_t *)frm->frm_payload;
-	FCOE_V2B_4(0, ffr->ffr_retry_delay_timer);
+	FCOE_V2B_2(0, ffr->ffr_retry_delay_timer);
 	FCOE_V2B_1(0, ffr->ffr_flags);
 	if (task->task_scsi_status == STATUS_CHECK || task->task_resid) {
 		if (task->task_scsi_status == STATUS_CHECK) {
diff --git a/usr/src/uts/common/io/fibre-channel/impl/fp.wlcmd b/usr/src/uts/common/io/fibre-channel/impl/fp.wlcmd
deleted file mode 100644
index f94b76a716..0000000000
--- a/usr/src/uts/common/io/fibre-channel/impl/fp.wlcmd
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#
-
-one fc_port
-
-#
-# List of interrupt handlers in the port driver
-#
-FP_INTERRUPT_HANDLERS="fp_flogi_intr fp_plogi_intr fp_logo_intr fp_adisc_intr\
-			fp_ns_intr fp_intr fp_linit_intr fp_rls_intr"
-
-#
-# Lately warlock doesn't seem to recognize job_comp field in 2.8
-# environment - however it does in fp_with_fctl.wlcmd. So root
-# out the following functions
-#
-#      PS: ns suggests me to start using locklint, but that will
-#	   take some time
-#
-root fp_startup_done
-
-#
-# List of callbacks in the port driver
-#
-FP_CALLBACK_HANDLERS="fp_statec_cb fp_unsol_cb"
-
-#
-# Give warlock a dummy target for each of the function
-# pointers in the fca_tran structure.
-#
-
-for ptr in `funcptrs | grep '^fca_tran::'`
-do
-	add $ptr target warlock_dummy
-done
-
-#
-# add interrupt targets to fca_transport and fca_els_send
-#
-add fp_cmd::cmd_transport targets $FP_INTERRUPT_HANDLERS
-add fc_packet::pkt_comp targets $FP_INTERRUPT_HANDLERS
-
-#
-# Till such time we actually use the following bus_ops
-# vectors, make them target to warlock_dummys
-#
-add bus_ops::bus_get_eventcookie target warlock_dummy
-add bus_ops::bus_add_eventcall target warlock_dummy
-add bus_ops::bus_remove_eventcall target warlock_dummy
-add bus_ops::bus_post_event target warlock_dummy
-add bus_ops::bus_intr_ctl target warlock_dummy
-
-ignore fp_cache_constructor fp_cache_destructor
-
-#
-# Make all callback handlers as root
-#
-for ptr in $FP_CALLBACK_HANDLERS
-do
-	root $ptr
-done
diff --git a/usr/src/uts/common/io/fibre-channel/impl/fp_with_fctl.wlcmd b/usr/src/uts/common/io/fibre-channel/impl/fp_with_fctl.wlcmd
deleted file mode 100644
index 7d52cbc867..0000000000
--- a/usr/src/uts/common/io/fibre-channel/impl/fp_with_fctl.wlcmd
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#
-
-. ./fp.wlcmd
-
-FCTL_ULP_FUNCTIONS="fc_ulp_add fc_ulp_remove fc_ulp_init_packet\
-	fc_ulp_uninit_packet fc_ulp_getportmap fc_ulp_login\
-	fc_ulp_getmap fc_ulp_get_device_by_nwwn fc_ulp_get_port_device\
-	fc_ulp_get_portlist fc_ulp_node_ns fc_ulp_port_ns fc_ulp_transport\
-	fc_ulp_issue_els fc_ulp_uballoc fc_ulp_ubfree fc_ulp_ubrelease\
-	fc_ulp_abort fc_ulp_linkreset fc_ulp_port_reset fc_ulp_get_did\
-	fc_ulp_logout fc_ulp_get_pd_state fc_ulp_is_fc4_bit_set\
-	fc_fca_update_errors fc_ulp_get_port_instance fc_ulp_error\
-	fc_ulp_pkt_error fc_ulp_is_name_present fc_ulp_is_type_present\
-	fc_ulp_get_pwwn_by_did fc_ulp_is_plogi_initiator\
-	fc_ulp_get_pwwn_by_did fc_ulp_get_port_handle\
-	fc_ulp_pwwn_to_portmap"
-
-FCTL_FCA_FUNCTIONS="fc_fca_attach fc_fca_detach fc_fca_init fc_fca_error\
-	fc_fca_pkt_error"
-
-FCTL_IGNORABLE_FUNCTIONS="fctl_get_pd_state fctl_set_pd_state\
-	fctl_wwn_match"
-
-#
-# Functions invoked via job_comp pointer for asynchronous request
-#
-add job_request::job_comp target fctl_link_reset_done
-add job_request::job_comp target fp.c:fp_startup_done
-
-add ulp_modinfo::ulp_port_attach target fc_ulp_getportmap
-add ulp_modinfo::ulp_statec_callback target fc_ulp_getportmap
-add ulp_modinfo::ulp_port_detach target warlock_dummy
-add ulp_modinfo::ulp_port_ioctl target warlock_dummy
-add ulp_modinfo::ulp_els_callback target warlock_dummy
-add ulp_modinfo::ulp_data_callback target warlock_dummy
-
-ignore fctl_cache_constructor fctl_cache_destructor
-
-for ptr in $FCTL_IGNORABLE_FUNCTIONS
-do
-	ignore $ptr
-done
-
-for ptr in $FCTL_ULP_FUNCTIONS
-do
-	root $ptr
-done
-
-for ptr in $FCTL_FCA_FUNCTIONS
-do
-	root $ptr
-done
diff --git a/usr/src/uts/common/io/fibre-channel/ulp/fcp.wlcmd b/usr/src/uts/common/io/fibre-channel/ulp/fcp.wlcmd
deleted file mode 100644
index 1234f8c219..0000000000
--- a/usr/src/uts/common/io/fibre-channel/ulp/fcp.wlcmd
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-
-one fcp_port 
-
-#
-# List of callbacks
-#
-
-FCP_CALLBACK_HANDLERS="fcp_statec_callback fcp_cmd_callback \
-		       fcp_icmd_callback fcp_scsi_callback \
-		       fcp_els_callback fcp_data_callback \
-		       fcp_unsol_callback fcp_resource_callback"
-
-root fcp_port_attach fcp_port_detach fcp_port_ioctl
-
-root fcp_scsi_reset_notify
-
-root fcp_kmem_cache_constructor fcp_kmem_cache_destructor
-
-for ptr in $FCP_CALLBACK_HANDLERS
-do
-	root $ptr
-done
-
-root fcp_hp_daemon fcp_watch
-
-add scsi_pkt::pkt_comp targets \
-	fcp_scsi_start \
-	fcp_scsi_abort \
-	fcp_scsi_getcap \
-	fcp_scsi_setcap \
-	fcp_scsi_dmafree \
-	fcp_scsi_sync_pkt \
-	fcp_scsi_destroy_pkt \
-	fcp_scsi_init_pkt \
-	fcp_scsi_tgt_init \
-	fcp_scsi_tgt_free \
-	fcp_scsi_bus_get_eventcookie \
-	fcp_scsi_bus_add_eventcall \
-	fcp_scsi_bus_remove_eventcall \
-	fcp_scsi_bus_post_event
-
diff --git a/usr/src/uts/common/io/ib/inc.flg b/usr/src/uts/common/io/ib/inc.flg
index 6931d133b4..e957c6c30b 100644
--- a/usr/src/uts/common/io/ib/inc.flg
+++ b/usr/src/uts/common/io/ib/inc.flg
@@ -26,7 +26,7 @@
 
 #
 # This file brings down all that is needed to build the
-# core Infiniband code. 
+# core Infiniband code.
 #
 
 # header files
@@ -50,10 +50,6 @@ find_files "s.*.h"	\
 find_files "s.*"	\
 	usr/src/lib/cfgadm_plugins/ib
 
-# warlock
-find_files "s.*"	\
-	usr/src/uts/common/io/warlock
-
 # to compile the drivers/modules
 find_files "s.*"	\
 	usr/src/uts/sparc/ib		\
diff --git a/usr/src/uts/common/io/warlock/aac.wlcmd b/usr/src/uts/common/io/warlock/aac.wlcmd
deleted file mode 100644
index dcab794fd6..0000000000
--- a/usr/src/uts/common/io/warlock/aac.wlcmd
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-one aac_softstate
-
-add aac_softstate::aac_if.aif_get_fwstatus target \
-	aac_rx_get_fwstatus \
-	aac_rkt_get_fwstatus
-add aac_softstate::aac_if.aif_get_mailbox target \
-	aac_rx_get_mailbox \
-	aac_rkt_get_mailbox
-add aac_softstate::aac_if.aif_set_mailbox target \
-	aac_rx_set_mailbox \
-	aac_rkt_set_mailbox
-add aac_cmd::aac_cmd_fib target \
-	aac_cmd_fib_rawio \
-	aac_cmd_fib_brw64 \
-	aac_cmd_fib_brw \
-	aac_cmd_fib_copy \
-	aac_cmd_fib_scsi32 \
-	aac_cmd_fib_scsi64
-add aac_softstate::aac_cmd_fib_scsi target \
-	aac_cmd_fib_scsi32 \
-	aac_cmd_fib_scsi64
-
-root aac_intr_old aac_intr_new aac_fm_error_cb aac_name_node aac_quiesce
-
-add scsi_pkt::pkt_comp target \
-	aac_tran_destroy_pkt \
-	aac_tran_init_pkt \
-	aac_tran_start \
-	aac_tran_abort \
-	aac_tran_reset \
-	aac_tran_setcap \
-	aac_tran_getcap \
-	aac_tran_dmafree \
-	aac_tran_tgt_init \
-	aac_tran_sync_pkt
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-root    scsi_hba_bus_power
diff --git a/usr/src/uts/common/io/warlock/ahci.wlcmd b/usr/src/uts/common/io/warlock/ahci.wlcmd
deleted file mode 100644
index e93874fa95..0000000000
--- a/usr/src/uts/common/io/warlock/ahci.wlcmd
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-# usr/src/uts/common/io/warlock/ahci.wlcmd
-
-one     ahci_ctl
-one	ahci_port
-
-one     scsi_device
-one     __ddi_xbuf_attr
-one     sd_lun
-one     sd_resv_reclaim_request
-
-root	ahci_intr
-root	ahci_watchdog_handler
-root	ahci_events_handler
-
-add     sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-root    sd.c:sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root    sd.c:sd_wm_cache_constructor sd_wm_cache_destructor
-root    sd.c:sd_read_modify_write_task sd_reenable_dsense_task
-root    sd.c:sd_failfast_flushq_callback sd_start_direct_priority_command
-root    sd.c:sdstrategy sdioctl
-root	sd.c:sd_target_change_task
-
-root    scsi_hba.c:scsi_hba_bus_power
-
-ignore  sd.c:sd_scsi_probe_cache_fini
-ignore  sd.c:sd_scsi_probe_cache_init
-ignore	sd.c:sd_scsi_target_lun_init
-ignore	sd.c:sd_scsi_target_lun_fini
-root    sd.c:sd_taskq_create
-root    sd.c:sd_taskq_delete
-
-add     bus_ops::bus_add_eventcall              targets warlock_dummy
-add     bus_ops::bus_config                     targets warlock_dummy
-add     bus_ops::bus_get_eventcookie            targets warlock_dummy
-add     bus_ops::bus_intr_ctl                   targets warlock_dummy
-add     bus_ops::bus_post_event                 targets warlock_dummy
-add     bus_ops::bus_remove_eventcall           targets warlock_dummy
-add     bus_ops::bus_unconfig                   targets warlock_dummy
-
-add     scsi_hba_tran::tran_tgt_init    targets sata_scsi_tgt_init
-add     scsi_hba_tran::tran_tgt_probe   targets sata_scsi_tgt_probe
-add     scsi_hba_tran::tran_tgt_free    targets sata_scsi_tgt_free
-add     scsi_hba_tran::tran_start       targets sata_scsi_start
-add     scsi_hba_tran::tran_abort       targets sata_scsi_abort
-add     scsi_hba_tran::tran_reset       targets sata_scsi_reset
-add     scsi_hba_tran::tran_getcap      targets sata_scsi_getcap
-add     scsi_hba_tran::tran_setcap      targets sata_scsi_setcap
-add     scsi_hba_tran::tran_init_pkt    targets sata_scsi_init_pkt
-add     scsi_hba_tran::tran_destroy_pkt targets sata_scsi_destroy_pkt
-add	scsi_hba_tran::tran_sync_pkt	targets sata_scsi_sync_pkt
-add	scsi_hba_tran::tran_dmafree	targets sata_scsi_dmafree
-
-add     scsi_hba_tran::tran_add_eventcall       targets warlock_dummy
-add     scsi_hba_tran::tran_bus_config          targets warlock_dummy
-add     scsi_hba_tran::tran_bus_power           targets warlock_dummy
-add     scsi_hba_tran::tran_bus_unconfig        targets warlock_dummy
-add     scsi_hba_tran::tran_get_eventcookie     targets warlock_dummy
-add     scsi_hba_tran::tran_get_name            targets warlock_dummy
-add     scsi_hba_tran::tran_post_event          targets warlock_dummy
-add     scsi_hba_tran::tran_remove_eventcall    targets warlock_dummy
-
-add     dk_callback::dkc_callback               targets warlock_dummy
-add     sd_uscsi_info::ui_dkc.dkc_callback      targets warlock_dummy
-
-add scsi_watch_request::swr_callback targets \
-        sd.c:sd_mhd_watch_cb \
-        sd.c:sd_media_watch_cb
-
-root	ahci_fm_error_cb
-
-add scsi_pkt::pkt_comp targets \
-        scsi_watch.c:scsi_watch_request_intr \
-        sd.c:sdintr \
-        sata_scsi_destroy_pkt \
-        sata_scsi_init_pkt \
-        sata_scsi_start \
-        sata_scsi_abort \
-        sata_scsi_reset \
-        sata_scsi_start \
-	sata_scsi_sync_pkt
-
-add     __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-ignore  sd.c:sd_mhd_reset_notify_cb
-ignore	delay
-
-assert order    ahci_ctl::ahcictl_mutex ahci_port::ahciport_mutex
diff --git a/usr/src/uts/common/io/warlock/audiohd.wlcmd b/usr/src/uts/common/io/warlock/audiohd.wlcmd
deleted file mode 100644
index ccfed972f3..0000000000
--- a/usr/src/uts/common/io/warlock/audiohd.wlcmd
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-
-### specify the root functions
-root	audiohd_attach
-root	audiohd_detach
-root	audiohd_engine_open
-root	audiohd_engine_close
-root	audiohd_engine_start
-root	audiohd_engine_stop
-root	audiohd_engine_count
-root	audiohd_engine_format
-root	audiohd_engine_channels
-root	audiohd_engine_rate
-root	audiohd_engine_sync
-root	audiohd_quiesce
-root	audiohd_resume
-root	audiohd_suspend
-
-root	audiohd_set_beep
-root	audiohd_set_cd
-root	audiohd_set_center
-root	audiohd_set_front
-root	audiohd_set_headphone
-root	audiohd_set_lfe
-root	audiohd_set_linein
-root	audiohd_set_mic
-root	audiohd_set_rear
-root	audiohd_set_recsrc
-root	audiohd_set_speaker
-root	audiohd_set_surround
-root	audiohd_set_mongain
-root	audiohd_set_loopback
-root	audiohd_beep_on
-root	audiohd_beep_off
-root	audiohd_beep_freq
-root	audiohd_get_control
-
-### thread functions
-add	bus_ops::bus_add_eventcall	target	warlock_dummy
-add	bus_ops::bus_config		target  warlock_dummy
-add	bus_ops::bus_get_eventcookie	target  warlock_dummy
-add	bus_ops::bus_intr_ctl		target  warlock_dummy
-add	bus_ops::bus_post_event		target  warlock_dummy
-add	bus_ops::bus_remove_eventcall	target  warlock_dummy
-add	bus_ops::bus_unconfig		target  warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/av1394.wlcmd b/usr/src/uts/common/io/warlock/av1394.wlcmd
deleted file mode 100644
index db4ca0b85a..0000000000
--- a/usr/src/uts/common/io/warlock/av1394.wlcmd
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-one av1394_inst_s
-
-### DDI/DKI entry points
-root	av1394_getinfo
-root	av1394_attach
-root	av1394_detach
-root	av1394_open
-root	av1394_close
-root	av1394_read
-root	av1394_write
-root	av1394_ioctl
-root	av1394_poll
-root	av1394_devmap
-
-### callbacks
-root	av1394_bus_reset
-root	av1394_disconnect
-root	av1394_reconnect
-root	av1394_isoch_softintr
-root	av1394_ic_rsrc_fail
-root	av1394_ir_ixl_frame_cb
-root	av1394_ir_dma_stopped_cb
-root	av1394_it_ixl_begin_cb
-root	av1394_it_ixl_buf_cb
-root	av1394_it_ixl_eof_cb
-root	av1394_it_dma_stopped_cb
-root	av1394_pcr_recv_read_request
-root	av1394_pcr_recv_lock_request
-root	av1394_fcp_cmd_completion_cb
-root	av1394_fcp_cmd_write_request_cb
-root	av1394_fcp_resp_write_request_cb
-
-add	dev_ops::devo_getinfo targets av1394_getinfo
-add	dev_ops::devo_attach targets av1394_attach
-add	dev_ops::devo_detach targets av1394_detach
-
-add	bus_ops::bus_add_eventcall targets warlock_dummy
-add	bus_ops::bus_get_eventcookie targets warlock_dummy
-add	bus_ops::bus_post_event targets warlock_dummy
-add	bus_ops::bus_remove_eventcall targets warlock_dummy
-add	bus_ops::bus_intr_ctl targets warlock_dummy
-add	bus_ops::bus_config targets warlock_dummy
-add	bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/bcm_sata.wlcmd b/usr/src/uts/common/io/warlock/bcm_sata.wlcmd
deleted file mode 100644
index 05b81e47a3..0000000000
--- a/usr/src/uts/common/io/warlock/bcm_sata.wlcmd
+++ /dev/null
@@ -1,110 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-# usr/src/uts/common/io/warlock/bcm_sata.wlcmd
-
-one     bcm_ctl
-one	bcm_port
-
-one     scsi_device
-one     __ddi_xbuf_attr
-one     sd_lun
-one     sd_resv_reclaim_request
-
-root    bcm_intr
-root    bcm_watchdog_handler
-root    bcm_events_handler
-
-add     sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-root    sd.c:sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root    sd.c:sd_wm_cache_constructor sd_wm_cache_destructor
-root    sd.c:sd_read_modify_write_task sd_reenable_dsense_task
-root    sd.c:sd_failfast_flushq_callback sd_start_direct_priority_command
-root    sd.c:sdstrategy sdioctl
-root	sd.c:sd_target_change_task
-
-root    scsi_hba.c:scsi_hba_bus_power
-
-ignore  sd.c:sd_scsi_probe_cache_fini
-ignore  sd.c:sd_scsi_probe_cache_init
-ignore	sd.c:sd_scsi_target_lun_init
-ignore	sd.c:sd_scsi_target_lun_fini
-
-root    sd.c:sd_taskq_create
-root    sd.c:sd_taskq_delete
-
-add     bus_ops::bus_add_eventcall              targets warlock_dummy
-add     bus_ops::bus_config                     targets warlock_dummy
-add     bus_ops::bus_get_eventcookie            targets warlock_dummy
-add     bus_ops::bus_intr_ctl                   targets warlock_dummy
-add     bus_ops::bus_post_event                 targets warlock_dummy
-add     bus_ops::bus_remove_eventcall           targets warlock_dummy
-add     bus_ops::bus_unconfig                   targets warlock_dummy
-
-add     scsi_hba_tran::tran_tgt_init    targets sata_scsi_tgt_init
-add     scsi_hba_tran::tran_tgt_probe   targets sata_scsi_tgt_probe
-add     scsi_hba_tran::tran_tgt_free    targets sata_scsi_tgt_free
-add     scsi_hba_tran::tran_start       targets sata_scsi_start
-add     scsi_hba_tran::tran_abort       targets sata_scsi_abort
-add     scsi_hba_tran::tran_reset       targets sata_scsi_reset
-add     scsi_hba_tran::tran_getcap      targets sata_scsi_getcap
-add     scsi_hba_tran::tran_setcap      targets sata_scsi_setcap
-add     scsi_hba_tran::tran_init_pkt    targets sata_scsi_init_pkt
-add     scsi_hba_tran::tran_destroy_pkt targets sata_scsi_destroy_pkt
-add	scsi_hba_tran::tran_sync_pkt	targets sata_scsi_sync_pkt
-add	scsi_hba_tran::tran_dmafree	targets sata_scsi_dmafree
-
-add     scsi_hba_tran::tran_add_eventcall       targets warlock_dummy
-add     scsi_hba_tran::tran_bus_config          targets warlock_dummy
-add     scsi_hba_tran::tran_bus_power           targets warlock_dummy
-add     scsi_hba_tran::tran_bus_unconfig        targets warlock_dummy
-add     scsi_hba_tran::tran_get_eventcookie     targets warlock_dummy
-#add     scsi_hba_tran::tran_get_name            targets warlock_dummy
-add     scsi_hba_tran::tran_post_event          targets warlock_dummy
-add     scsi_hba_tran::tran_remove_eventcall    targets warlock_dummy
-
-add     dk_callback::dkc_callback               targets warlock_dummy
-add     sd_uscsi_info::ui_dkc.dkc_callback      targets warlock_dummy
-
-add scsi_watch_request::swr_callback targets \
-        sd.c:sd_mhd_watch_cb \
-        sd.c:sd_media_watch_cb
-
-add scsi_pkt::pkt_comp targets \
-        scsi_watch.c:scsi_watch_request_intr \
-        sd.c:sdintr \
-        sata_scsi_destroy_pkt \
-        sata_scsi_init_pkt \
-        sata_scsi_start \
-        sata_scsi_abort \
-        sata_scsi_reset \
-        sata_scsi_start \
-	sata_scsi_sync_pkt
-
-add     __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-ignore  sd.c:sd_mhd_reset_notify_cb
-ignore	delay
-
-assert order    bcm_ctl::bcmc_mutex bcm_port::bcmp_mutex
diff --git a/usr/src/uts/common/io/warlock/dad.wlcmd b/usr/src/uts/common/io/warlock/dad.wlcmd
deleted file mode 100644
index e73b9a3705..0000000000
--- a/usr/src/uts/common/io/warlock/dad.wlcmd
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-one dcd_device
-
-ignore dcd_reset_throttle dcd_rname inq_fill clean_print dcd_check_error 
-ignore dcduscsimin dcd_sname
-
-### Give warlock a dummy target for each of the function
-### pointers in the dcd_hba_tran structure.
-for ptr in `funcptrs | grep '^dcd_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-
-ignore dcdrunout dcdintr dcd_handle_incomplete dcd_check_error
-
-add        bus_ops::bus_add_eventcall targets warlock_dummy
-add        bus_ops::bus_get_eventcookie targets warlock_dummy
-add        bus_ops::bus_post_event targets warlock_dummy
-add        bus_ops::bus_remove_eventcall targets warlock_dummy
-add        bus_ops::bus_intr_ctl targets warlock_dummy
-add        bus_ops::bus_config targets warlock_dummy
-add        bus_ops::bus_unconfig targets warlock_dummy
-
-add	   dk_callback::dkc_callback targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/daplt.wlcmd b/usr/src/uts/common/io/warlock/daplt.wlcmd
deleted file mode 100644
index 9facdd1071..0000000000
--- a/usr/src/uts/common/io/warlock/daplt.wlcmd
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-
-root	daplka_cm_rc_handler
-root	daplka_cm_service_handler
-root	daplka_async_handler
-root	daplka_pre_mr_cleanup_callback
-root	daplka_timer_thread
-root	daplka_cq_handler
-root	daplka_shared_mr_cmp
-root	daplka_sm_notice_handler
-root	daplka_console
-
-add	daplka_hash_table::ht_free_func targets \
-    daplka_hash_ep_free		\
-    daplka_hash_mr_free		\
-    daplka_hash_sp_free		\
-    daplka_hash_mw_free		\
-    daplka_hash_cno_free	\
-    daplka_hash_evd_free	\
-    daplka_hash_pd_free  	\
-    daplka_hash_sp_unref	\
-    daplka_hash_timer_free	\
-    daplka_hash_srq_free
-
-add	daplka_hash_table::ht_lookup_func targets \
-    daplka_hash_generic_lookup
-
-add	bus_ops::bus_add_eventcall	targets warlock_dummy
-add	bus_ops::bus_get_eventcookie	targets warlock_dummy
-add	bus_ops::bus_post_event		targets warlock_dummy
-add	bus_ops::bus_remove_eventcall	targets warlock_dummy
-add	bus_ops::bus_intr_ctl		targets warlock_dummy
-add	bus_ops::bus_config		targets warlock_dummy
-add	bus_ops::bus_unconfig		targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/ddi_dki_comm.inc b/usr/src/uts/common/io/warlock/ddi_dki_comm.inc
deleted file mode 100644
index 0562d7ca50..0000000000
--- a/usr/src/uts/common/io/warlock/ddi_dki_comm.inc
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2007 Sun Microsystems, Inc.
- * All rights reserved.  Use is subject to license terms.
- */
-
-/*
- * Copyright 2014 Garrett D'Amore <garrett@damore.org>
- */
-
-/*
- * ddi_dki_comm.inc - Part of a pseudo-kernel to use when analyzing drivers
- * with warlock.
- *
- * The main idea here is to represent all of the ways that the kernel can
- * call into the driver, so that warlock has the correct view of the call
- * graph.
- *
- * This file represents the stuff in common between the DDI/DKI spec and
- * the current implementation.	It is included by both ddi_dki_{spec,impl}.c
- *
- * This is a SPARC version; some functions (e.g. ddi_dma_nextwin) should
- * be changed for an x86 version.
- */
-
-#include <sys/note.h>
-#include <sys/devops.h>
-#include <sys/ddi.h>
-#include <sys/sunddi.h>
-#include <sys/proc.h>
-
-_NOTE(DATA_READABLE_WITHOUT_LOCK( dev_ops cb_ops bus_ops ))
-
-/*
- * Now define a dev_ops, a cb_ops, and a bus_ops with 0 for each
- * entry point, so that warlock doesn't complain that these
- * function pointers have no bindings.
- *	1  2  3  4  5  6  7  8	9 10 11 12 13 14 15 16 17 18 19 20 21 22
- */
-struct dev_ops *devops_p, warlock_dev_ops = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-struct cb_ops *cbops_p, warlock_cb_ops = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-struct bus_ops *busops_p, warlock_bus_ops = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-
-/* This rendition of mod_remove() tells warlock that it calls detach. */
-int
-mod_remove(struct modlinkage *a) {
-	(*devops_p->devo_detach)(NULL, 0);
-}
-
-/* This rendition of physio() shows that it calls its func ptr args. */
-int
-physio(
-	int (*strategy)(struct buf *),
-	struct buf *a,
-	dev_t b,
-	int c,
-	void (*mincnt)(struct buf *),
-	struct uio *d)
-{
-	(*strategy)(0);
-	(*mincnt)(0);
-}
-
-/*
- * Tell warlock that args to some funcs get called back as separate threads.
- */
-timeout_id_t
-timeout(void (*fp)(void *), void *a, clock_t b)
-{
-	thread_create(0, 0, (void (*)())fp, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_add_intr(dev_info_t *a, uint_t b, ddi_iblock_cookie_t *c,
-	ddi_idevice_cookie_t *d, uint_t (*fp)(caddr_t), caddr_t e)
-{
-	thread_create(0, 0, (void (*)())fp, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_add_softintr(dev_info_t *a, int b, ddi_softintr_t *c,
-    ddi_iblock_cookie_t *d, ddi_idevice_cookie_t *e, uint_t (*fp)(caddr_t),
-    caddr_t f)
-{
-	thread_create(0, 0, (void (*)())fp, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_intr_add_handler(ddi_intr_handle_t h, ddi_intr_handler_t inthandler,
-    void *arg1, void *arg2)
-{
-	thread_create(0, 0, (void (*)())inthandler, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_intr_add_softint(dev_info_t *dip, ddi_softint_handle_t *h_p, int soft_pri,
-    ddi_intr_handler_t handler, void *arg1)
-{
-	thread_create(0, 0, (void (*)())handler, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_dma_addr_setup(
-	dev_info_t *a,
-	struct as *b,
-	caddr_t c,
-	size_t d,
-	uint_t e,
-	int (*fp)(void),
-	caddr_t f,
-	ddi_dma_lim_t *g,
-	ddi_dma_handle_t *h)
-{
-	struct bus_ops *ops;
-	(*ops->bus_dma_map)(0, 0, 0, 0);
-	thread_create(0, 0, (void (*)())fp, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_dma_buf_setup(
-	dev_info_t *a,
-	struct buf *b,
-	uint_t c,
-	int (*fp)(void),
-	caddr_t d,
-	ddi_dma_lim_t *e,
-	ddi_dma_handle_t *f)
-{
-	struct bus_ops *ops;
-	(*ops->bus_dma_map)(0, 0, 0, 0);
-	thread_create(0, 0, (void (*)())fp, 0, 0, 0, 0, 0);
-}
-
-void
-ddi_set_callback(
-	int (*fp)(caddr_t),
-	caddr_t a,
-	uintptr_t *b)
-{
-	thread_create(0, 0, (void (*)())fp, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_dma_mctl(dev_info_t *a, dev_info_t *b, ddi_dma_handle_t c,
-	enum ddi_dma_ctlops d, off_t *e, size_t *f, caddr_t *g,
-	uint_t h)
-{
-	struct bus_ops *ops;
-	(*ops->bus_dma_ctl)(0, 0, 0, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_dma_get_error(ddi_dma_handle_t h, uint_t len, caddr_t errblk)
-{
-	struct bus_ops *ops;
-	(*ops->bus_dma_ctl)(0, 0, 0, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_dma_sync(ddi_dma_handle_t h, off_t o, size_t l, uint_t whom)
-{
-	struct bus_ops *ops;
-	(*ops->bus_dma_ctl)(0, 0, 0, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_prop_op(dev_t dev, dev_info_t *dip, ddi_prop_op_t prop_op, int mod_flags,
-    char *name, caddr_t valuep, int *lengthp)
-{
-	struct bus_ops *ops;
-	(*ops->bus_prop_op)(0, 0, 0, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_add_event_handler(dev_info_t *dip, ddi_eventcookie_t event,
-    void (*handler)(dev_info_t *, ddi_eventcookie_t, void *, void *),
-    void *arg, ddi_callback_id_t *id)
-{
-	struct bus_ops *ops;
-	return ((*ops->bus_add_eventcall)(dip, dip, event, handler, arg, id));
-}
-
-int
-ddi_remove_event_handler(ddi_callback_id_t id)
-{
-	dev_info_t *dip;
-	struct bus_ops *ops;
-	return ((*ops->bus_remove_eventcall)(dip, id));
-}
-
-
-int
-ddi_get_eventcookie(dev_info_t *dip, char *name,
-    ddi_eventcookie_t *event_cookiep)
-{
-	struct bus_ops *ops;
-	return ((*ops->bus_get_eventcookie)(dip, dip,
-	    name, event_cookiep));
-}
diff --git a/usr/src/uts/common/io/warlock/ddi_dki_impl.c b/usr/src/uts/common/io/warlock/ddi_dki_impl.c
deleted file mode 100644
index 3fc438fe98..0000000000
--- a/usr/src/uts/common/io/warlock/ddi_dki_impl.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/*
- * ddi_dki_impl.c - A pseudo-kernel to use when analyzing drivers with warlock.
- *
- * The main idea here is to represent all of the ways that the kernel can
- * call into the driver, so that warlock has the correct view of the call
- * graph.
- *
- * This version differs from ddi_dki_spec.c in that it represents the
- * current implementation of the DDI/DKI rather than the specification.
- */
-#include "ddi_dki_comm.inc"
-#include <sys/esunddi.h>
-#include <sys/sunndi.h>
-#include <sys/ddi.h>
-#include <sys/epm.h>
-#include <sys/proc.h>
-
-int warlock_dummy(void);
-int _init(void);
-int _fini(void);
-int _info(struct modinfo *a);
-int scsi_init(void);
-
-int main(void) {
-
-	/*
-	 * The following call will cause warlock to know about
-	 * warlock_dummy as a func that can be used to satisfy
-	 * unbound function pointers.  It shouldn't be needed
-	 * with the new warlock on suntools.
-	 */
-	warlock_dummy();
-
-	/*
-	 * When the following functions are called, there is never
-	 * more than one thread running in the driver.
-	 */
-	_init();
-	_fini();
-	_info(0);
-	(*devops_p->devo_identify)(0);
-	(*devops_p->devo_probe)(0);
-	(*devops_p->devo_attach)(0, 0);
-
-	/*
-	 * When the following functions are called, there may be
-	 * more than one thread running in the driver.
-	 */
-	_NOTE(COMPETING_THREADS_NOW)
-
-
-	scsi_init();
-
-	(*devops_p->devo_getinfo)(0, 0, 0, 0);
-	(*devops_p->devo_reset)(0, 0);
-	(*devops_p->devo_power)(0, 0, 0);
-
-	(*cbops_p->cb_open)(0, 0, 0, 0);
-	(*cbops_p->cb_close)(0, 0, 0, 0);
-	(*cbops_p->cb_strategy)(0);
-	(*cbops_p->cb_print)(0, 0);
-	(*cbops_p->cb_dump)(0, 0, 0, 0);
-	(*cbops_p->cb_read)(0, 0, 0);
-	(*cbops_p->cb_write)(0, 0, 0);
-	(*cbops_p->cb_ioctl)(0, 0, 0, 0, 0, 0);
-	(*cbops_p->cb_devmap)(0, 0, 0, 0, 0, 0);
-	(*cbops_p->cb_mmap)(0, 0, 0);
-	(*cbops_p->cb_segmap)(0, 0, 0, 0, 0, 0, 0, 0, 0);
-	(*cbops_p->cb_chpoll)(0, 0, 0, 0, 0);
-	(*cbops_p->cb_prop_op)(0, 0, 0, 0, 0, 0, 0);
-	(*cbops_p->cb_aread)(0, 0, 0);
-	(*cbops_p->cb_awrite)(0, 0, 0);
-
-	(*busops_p->bus_map)(0, 0, 0, 0, 0, 0);
-	(*busops_p->bus_get_intrspec)(0, 0, 0);
-	(*busops_p->bus_add_intrspec)(0, 0, 0, 0, 0, 0, 0, 0);
-	(*busops_p->bus_remove_intrspec)(0, 0, 0, 0);
-	(*busops_p->bus_map_fault)(0, 0, 0, 0, 0, 0, 0, 0, 0);
-	(*busops_p->bus_dma_map)(0, 0, 0, 0);
-	(*busops_p->bus_dma_allochdl)(0, 0, 0, 0, 0, 0);
-	(*busops_p->bus_dma_freehdl)(0, 0, 0);
-	(*busops_p->bus_dma_bindhdl)(0, 0, 0, 0, 0, 0);
-	(*busops_p->bus_dma_unbindhdl)(0, 0, 0);
-	(*busops_p->bus_dma_flush)(0, 0, 0, 0, 0, 0);
-	(*busops_p->bus_dma_win)(0, 0, 0, 0, 0, 0, 0, 0);
-	(*busops_p->bus_dma_ctl)(0, 0, 0, 0, 0, 0, 0, 0);
-	(*busops_p->bus_ctl)(0, 0, 0, 0, 0);
-	(*busops_p->bus_prop_op)(0, 0, 0, 0, 0, 0, 0, 0);
-
-	(*busops_p->bus_get_eventcookie)(0, 0, 0, 0);
-	(*busops_p->bus_add_eventcall)(0, 0, 0, 0, 0, 0);
-	(*busops_p->bus_remove_eventcall)(0, 0);
-	(*busops_p->bus_post_event)(0, 0, 0, 0);
-	(*busops_p->bus_intr_ctl)(0, 0, 0, 0, 0);
-
-	(*busops_p->bus_config)(0, 0, 0, 0, 0);
-	(*busops_p->bus_unconfig)(0, 0, 0, 0);
-
-#ifndef __lock_lint
-/* this causes warnings and it is unclear how to handle this */
-	(*busops_p->bus_fm_init)(0, 0, 0, 0);
-	(*busops_p->bus_fm_fini)(0, 0);
-	(*busops_p->bus_fm_access_enter)(0, 0);
-	(*busops_p->bus_fm_access_exit)(0, 0);
-	(*busops_p->bus_power)(0, 0, 0, 0, 0);
-	(*busops_p->bus_intr_op)(0, 0, 0, 0, 0);
-#endif
-
-	ndi_devi_offline(0, 0);
-	_NOTE(NO_COMPETING_THREADS_NOW)
-}
-
-	/* Power managment framework calls */
-int
-pm_set_power(dev_info_t *dip, int comp, int level, int direction,
-    pm_canblock_t canblock, int scan, int *retp)
-{
-	(*devops_p->devo_power)(0, 0, 0);
-}
-
-int
-pm_raise_power(dev_info_t *dip, int comp, int level) {
-	(*devops_p->devo_power)(0, 0, 0);
-}
-
-int
-pm_lower_power(dev_info_t *dip, int comp, int level) {
-	(*devops_p->devo_power)(0, 0, 0);
-}
-
-static kmutex_t mutex;
-static kcondvar_t cv;
-
-void
-delay(clock_t ticks)
-{
-	mutex_enter(&mutex);
-	cv_wait(&cv, &mutex);
-	mutex_exit(&mutex);
-}
-
-void
-putnext(queue_t *q, mblk_t *mp)
-{
-	mutex_enter(&mutex);
-	cv_wait(&cv, &mutex);
-	mutex_exit(&mutex);
-}
-
-int
-ndi_devi_offline(dev_info_t *dip, uint_t flags) {
-	(*busops_p->bus_dma_ctl)(0, 0, 0, 0, 0, 0, 0, 0);
-	(*busops_p->bus_ctl)(0, 0, 0, 0, 0);
-	(*busops_p->bus_get_eventcookie)(0, 0, 0, 0);
-	(*busops_p->bus_add_eventcall)(0, 0, 0, 0, 0, 0);
-	(*busops_p->bus_remove_eventcall)(0, 0);
-	(*busops_p->bus_post_event)(0, 0, 0, 0);
-	(*busops_p->bus_unconfig)(0, 0, 0, 0);
-}
-
-int
-ndi_devi_online(dev_info_t *dip, uint_t flags) {
-	(*busops_p->bus_config)(0, 0, 0, 0, 0);
-}
diff --git a/usr/src/uts/common/io/warlock/ecpp.wlcmd b/usr/src/uts/common/io/warlock/ecpp.wlcmd
deleted file mode 100644
index 4bba58628e..0000000000
--- a/usr/src/uts/common/io/warlock/ecpp.wlcmd
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-one ecppunit
-
-### specify the root functions
-
-root ecpp_open
-root ecpp_close 
-root ecpp_wput
-root ecpp_wsrv
-root ecpp_rsrv
-root ecpp_kstat_update
-root ecpp_kstatintr_update
-
-add	bus_ops::bus_add_eventcall targets warlock_dummy
-add	bus_ops::bus_get_eventcookie targets warlock_dummy
-add	bus_ops::bus_post_event targets warlock_dummy
-add	bus_ops::bus_remove_eventcall targets warlock_dummy
-add	bus_ops::bus_intr_ctl targets warlock_dummy
-add     bus_ops::bus_config targets warlock_dummy
-add     bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/ehci.wlcmd b/usr/src/uts/common/io/warlock/ehci.wlcmd
deleted file mode 100644
index b53ef2598c..0000000000
--- a/usr/src/uts/common/io/warlock/ehci.wlcmd
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-
-one ehci_state
-one usba_device
-one usba_pipe_handle_data
-one usba_ph_impl
-
-### specify the root functions 
-
-### hcdi entry points
-root ehci_hcdi_pipe_open 
-root ehci_hcdi_pipe_close 
-root ehci_hcdi_pipe_stop_intr_polling 
-root ehci_hcdi_pipe_stop_isoc_polling 
-root ehci_hcdi_pipe_reset 
-root ehci_hcdi_bulk_transfer_size
-root ehci_hcdi_get_current_frame_number
-root ehci_hcdi_get_max_isoc_pkts
-root ehci_intr
-root ehci_hcdi_pipe_ctrl_xfer
-root ehci_hcdi_pipe_bulk_xfer
-root ehci_hcdi_pipe_intr_xfer
-root ehci_hcdi_pipe_isoc_xfer
-root ehci_hcdi_pm_support
-root ehci_hcdi_pipe_reset_data_toggle
-root ehci_quiesce
-
-root hubd_hotplug_thread
-root hubd_exception_cb
-root hubd_read_cb
-root hubd_disconnect_event_cb
-root hubd_post_resume_event_cb
-root hubd_pre_suspend_event_cb
-root hubd_reconnect_event_cb
-root hubd_bus_power
-root usba_pipe_sync_close
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-
-
-### POLLED entry points
-root   ehci_hcdi_polled_input_init
-root   ehci_hcdi_polled_input_fini
-root   ehci_hcdi_polled_input_enter
-root   ehci_hcdi_polled_input_exit
-root   ehci_hcdi_polled_read
-root   ehci_hcdi_polled_output_init
-root   ehci_hcdi_polled_output_fini
-root   ehci_hcdi_polled_output_enter
-root   ehci_hcdi_polled_output_exit
-root   ehci_hcdi_polled_write
-
-### currently unused functions
- 
-root ehci_print_qh
-root ehci_print_qtd
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-
-add usba_hcdi_ops::usba_hcdi_console_input_init targets \
-						ehci_hcdi_polled_input_init
-add usba_hcdi_ops::usba_hcdi_console_input_fini targets \
-						ehci_hcdi_polled_input_fini
-
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usb_bulk_req::bulk_cb targets warlock_dummy
-add usb_bulk_req::bulk_exc_cb targets warlock_dummy
-add usb_intr_req::intr_cb targets hubd_read_cb
-add usb_intr_req::intr_exc_cb targets hubd_exception_cb
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/esp.wlcmd b/usr/src/uts/common/io/warlock/esp.wlcmd
deleted file mode 100644
index fbc8230b82..0000000000
--- a/usr/src/uts/common/io/warlock/esp.wlcmd
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-one esp 
-
-add esp_cmd::cmd_pkt.pkt_comp targets \
-	esp_scsi_destroy_pkt \
-	esp_scsi_init_pkt \
-	esp_start \
-	esp_abort \
-	esp_reset \
-	esp_setcap \
-	esp_getcap \
-	esp_scsi_dmafree \
-	esp_scsi_reset_notify \
-	esp_scsi_sync_pkt
-
-add notify_entry::callback target warlock_dummy
-
-root esp_kmem_cache_constructor esp_kmem_cache_destructor
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-root    scsi_hba_bus_power
-ignore  delay
-
-
diff --git a/usr/src/uts/common/io/warlock/fas.wlcmd b/usr/src/uts/common/io/warlock/fas.wlcmd
deleted file mode 100644
index 88f2811ba0..0000000000
--- a/usr/src/uts/common/io/warlock/fas.wlcmd
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-one fas 
-
-add scsi_pkt::pkt_comp targets \
-	fas_scsi_destroy_pkt \
-	fas_scsi_init_pkt \
-	fas_scsi_start \
-	fas_scsi_abort \
-	fas_scsi_reset \
-	fas_scsi_setcap \
-	fas_scsi_getcap \
-	fas_scsi_dmafree \
-	fas_scsi_reset_notify \
-	fas_scsi_sync_pkt
-
-add notify_entry::callback target warlock_dummy
-
-root fas_kmem_cache_constructor fas_kmem_cache_destructor
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-root    scsi_hba_bus_power
-ignore  delay
-
diff --git a/usr/src/uts/common/io/warlock/glm.wlcmd b/usr/src/uts/common/io/warlock/glm.wlcmd
deleted file mode 100644
index 65a721c409..0000000000
--- a/usr/src/uts/common/io/warlock/glm.wlcmd
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-one glm
-
-add scsi_pkt::pkt_comp targets \
-	glm_scsi_destroy_pkt \
-	glm_scsi_init_pkt \
-	glm_scsi_start \
-	glm_scsi_abort \
-	glm_scsi_reset \
-	glm_scsi_setcap \
-	glm_scsi_getcap \
-	glm_scsi_dmafree \
-	glm_scsi_reset_notify \
-	glm_scsi_tgt_init \
-	glm_scsi_tgt_free \
-	glm_scsi_sync_pkt
-
-add notify_entry::callback target warlock_dummy
-
-root glm_kmem_cache_constructor glm_kmem_cache_destructor
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-root    scsi_hba_bus_power
-ignore  delay
-
diff --git a/usr/src/uts/common/io/warlock/hci1394.wlcmd b/usr/src/uts/common/io/warlock/hci1394.wlcmd
deleted file mode 100644
index 8fc9c07f6e..0000000000
--- a/usr/src/uts/common/io/warlock/hci1394.wlcmd
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-one hci1394_state_s
-
-### HAL interface entry points
-root hci1394_s1394if_shutdown
-root hci1394_s1394if_phy
-root hci1394_s1394if_read
-root hci1394_s1394if_read_response
-root hci1394_s1394if_write
-root hci1394_s1394if_write_response
-root hci1394_s1394if_response_complete
-root hci1394_s1394if_lock
-root hci1394_s1394if_lock_response
-root hci1394_alloc_isoch_dma
-root hci1394_free_isoch_dma
-root hci1394_start_isoch_dma
-root hci1394_stop_isoch_dma
-root hci1394_update_isoch_dma
-root hci1394_s1394if_update_config_rom
-root hci1394_s1394if_reset_bus
-root hci1394_s1394if_short_bus_reset
-root hci1394_s1394if_set_contender_bit
-root hci1394_s1394if_set_root_holdoff_bit
-root hci1394_s1394if_set_gap_count
-root hci1394_s1394if_csr_read
-root hci1394_s1394if_csr_write
-root hci1394_s1394if_csr_cswap32
-root hci1394_s1394if_phy_filter_set
-root hci1394_s1394if_phy_filter_clr
-root hci1394_s1394if_power_state_change
-
-### timeout callbacks
-root hci1394_async_pending_timeout
-
-### currently unused functions
-root hci1394_isoch_resume
-root hci1394_ixl_set_start
-root hci1394_ohci_arreq_stop
-root hci1394_ohci_arresp_stop
-root hci1394_ohci_link_disable
-root hci1394_ohci_phy_clr
-
-add h1394_lock_request/recv_lock_req targets s1394_send_response
-add h1394_read_request/recv_read_req targets s1394_send_response
-add h1394_write_request/recv_write_req targets s1394_send_response
-
-add s1394_hal_s::halinfo.hal_events.response_complete targets \
-	hci1394_s1394if_response_complete
-add s1394_hal_s::halinfo.hal_events.set_contender_bit targets \
-	hci1394_s1394if_set_contender_bit
-
-### hci1394 callbacks
-add hci1394_ixl_dma_sync/callback targets warlock_dummy
-add hci1394_iso_ctxt_s::isoch_dma_stopped targets warlock_dummy
-
-add hci1394_tlist_s::tl_timer_info.tlt_callback targets \
-	hci1394_async_pending_timeout
-add hci1394_q_s::q_info.qi_start targets hci1394_async_arreq_start \
-	hci1394_async_arresp_start hci1394_async_atreq_start \
-	hci1394_async_atresp_start 
-add hci1394_q_s::q_info.qi_wake targets hci1394_async_arreq_wake \
-	hci1394_async_arresp_wake hci1394_async_atreq_wake \
-	hci1394_async_atresp_wake 
-
-# CMP/FCP
-add s1394_cmp_notify_reg_change/cb target warlock_dummy
-add s1394_fcp_recv_write_request/cb target warlock_dummy
-
-add h1394_read_request/recv_read_req target s1394_cmp_ompr_recv_read_request
-add h1394_lock_request/recv_lock_req target s1394_cmp_ompr_recv_lock_request
-add h1394_read_request/recv_read_req target s1394_cmp_impr_recv_read_request
-add h1394_lock_request/recv_lock_req target s1394_cmp_impr_recv_lock_request
-add h1394_write_request/recv_write_req target s1394_fcp_resp_recv_write_request
-add h1394_write_request/recv_write_req target s1394_fcp_cmd_recv_write_request
-
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/hermon.wlcmd b/usr/src/uts/common/io/warlock/hermon.wlcmd
deleted file mode 100644
index 2943b5c4f8..0000000000
--- a/usr/src/uts/common/io/warlock/hermon.wlcmd
+++ /dev/null
@@ -1,188 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-one hermon_state_s
-
-### IBTF CI interface entry points
-root	hermon_ci_query_hca_ports
-root	hermon_ci_modify_ports
-root	hermon_ci_modify_system_image
-root	hermon_ci_alloc_pd
-root	hermon_ci_free_pd
-root	hermon_ci_alloc_rdd
-root	hermon_ci_free_rdd
-root	hermon_ci_alloc_ah
-root	hermon_ci_free_ah
-root	hermon_ci_query_ah
-root	hermon_ci_modify_ah
-root	hermon_ci_alloc_qp
-root	hermon_ci_alloc_special_qp
-root	hermon_ci_alloc_qp_range
-root	hermon_ci_free_qp
-root	hermon_ci_release_qpn
-root	hermon_ci_query_qp
-root	hermon_ci_modify_qp
-root	hermon_ci_alloc_cq
-root	hermon_ci_free_cq
-root	hermon_ci_query_cq
-root	hermon_ci_resize_cq
-root	hermon_ci_modify_cq
-root	hermon_ci_alloc_cq_sched
-root	hermon_ci_free_cq_sched
-root	hermon_ci_alloc_eec
-root	hermon_ci_free_eec
-root	hermon_ci_query_eec
-root	hermon_ci_modify_eec
-root	hermon_ci_register_mr
-root	hermon_ci_register_buf
-root	hermon_ci_register_shared_mr
-root	hermon_ci_deregister_mr
-root	hermon_ci_query_mr
-root	hermon_ci_reregister_mr
-root	hermon_ci_reregister_buf
-root	hermon_ci_sync_mr
-root	hermon_ci_register_dma_mr
-root	hermon_ci_alloc_mw
-root	hermon_ci_free_mw
-root	hermon_ci_query_mw
-root	hermon_ci_attach_mcg
-root	hermon_ci_detach_mcg
-root	hermon_ci_post_send
-root	hermon_ci_post_recv
-root	hermon_ci_poll_cq
-root	hermon_ci_notify_cq
-root	hermon_ci_ci_data_in
-root	hermon_ci_ci_data_out
-root	hermon_ci_alloc_srq
-root	hermon_ci_free_srq
-root	hermon_ci_query_srq
-root	hermon_ci_modify_srq
-root	hermon_ci_post_srq
-root	hermon_ci_map_mem_area
-root	hermon_ci_unmap_mem_area
-root	hermon_ci_map_mem_iov
-root	hermon_ci_unmap_mem_iov
-root	hermon_ci_alloc_lkey
-root	hermon_ci_register_physical_mr
-root	hermon_ci_reregister_physical_mr
-root	hermon_ci_create_fmr_pool
-root	hermon_ci_destroy_fmr_pool
-root	hermon_ci_flush_fmr_pool
-root	hermon_ci_register_physical_fmr
-root	hermon_ci_deregister_fmr
-root	hermon_ci_alloc_io_mem
-root	hermon_ci_free_io_mem
-root	hermon_ci_query_cq_handler_id
-root	hermon_ci_not_supported
-
-### Hermon misc. (currently unused)
-root	hermon_config_int_mod
-root	hermon_hw_health_check
-root	hermon_rsrc_alloc_uarhdl
-root	hermon_sense_port_post
-
-### Hermon Firmware commands (currently unused)
-root	hermon_sync_tpt_cmd_post
-root	hermon_read_mtt_cmd_post
-root	hermon_write_mtt_cmd_post
-root	hermon_close_hca_cmd_post
-root	hermon_modify_mpt_cmd_post
-root	hermon_setdebug_post
-root	hermon_pci_capability_msix
-
-### Hermon Event Queue function pointers
-add	hermon_eq_poll/eqfunction targets hermon_cq_handler		\
-    hermon_cq_err_handler hermon_comm_estbl_handler			\
-    hermon_port_state_change_handler hermon_invreq_local_wq_err_handler	\
-    hermon_local_acc_vio_wq_err_handler					\
-    hermon_path_mig_handler hermon_path_mig_err_handler			\
-    hermon_local_wq_cat_err_handler hermon_sendq_drained_handler	\
-    hermon_cmd_complete_handler hermon_fexch_error_handler		\
-    hermon_srq_last_wqe_reached_handler hermon_catastrophic_handler	\
-    hermon_no_eqhandler hermon_eq_demux
-
-### Hermon agent callbacks
-root	hermon_agent_handle_req
-root	hermon_agent_request_cb
-root	hermon_agent_response_cb
-
-### Hermon interrupt allocation callback
-root	hermon_intr_cb_handler
-
-### Hermon kmem_cache constructors and destructors
-root	hermon_rsrc_cqhdl_constructor
-root	hermon_rsrc_cqhdl_destructor
-root	hermon_rsrc_qphdl_constructor
-root	hermon_rsrc_qphdl_destructor
-root	hermon_rsrc_pdhdl_constructor
-root	hermon_rsrc_pdhdl_destructor
-root	hermon_rsrc_refcnt_constructor
-root	hermon_rsrc_refcnt_destructor
-root	hermon_rsrc_ahhdl_constructor
-root	hermon_rsrc_ahhdl_destructor
-root	hermon_rsrc_mrhdl_constructor
-root	hermon_rsrc_mrhdl_destructor
-root	hermon_rsrc_srqhdl_constructor
-root	hermon_rsrc_srqhdl_destructor
-
-### Hermon kstat callback
-root	hermon_kstat_cntr_update
-root	hermon_kstat_perfcntr64_update
-
-### Hermon userland mapping callbacks and functions
-root	hermon_umap_umemlock_cb
-root	hermon_devmap_umem_map
-root	hermon_devmap_umem_dup
-root	hermon_devmap_umem_unmap
-root	hermon_devmap_devmem_map
-root	hermon_devmap_devmem_dup
-root	hermon_devmap_devmem_unmap
-root	hermon_devmap_dbrecmem_map
-root	hermon_devmap_dbrecmem_dup
-root	hermon_devmap_dbrecmem_unmap
-root	hermon_umap_db_compare
-add	hermon_umap_umemlock_cb/mr_callback	targets warlock_dummy
-
-
-### Hermon cleanup on close callback(s)
-add	hermon_umap_db_handle_onclose_cb/callback targets \
-    hermon_ioctl_flash_cleanup
-
-### Hermon QP number AVL tree compare function
-root	hermon_qpn_avl_compare
-
-### Hermon FMR processing
-add	hermon_sw_fmr_s::fmr_flush_function targets warlock_dummy
-
-### Hermon FMA processing
-root	hermon_inter_err_chk
-
-add	bus_ops::bus_add_eventcall	targets warlock_dummy
-add	bus_ops::bus_get_eventcookie	targets warlock_dummy
-add	bus_ops::bus_post_event		targets warlock_dummy
-add	bus_ops::bus_remove_eventcall	targets warlock_dummy
-add	bus_ops::bus_intr_ctl		targets warlock_dummy
-add	bus_ops::bus_config		targets warlock_dummy
-add	bus_ops::bus_unconfig		targets warlock_dummy
-
diff --git a/usr/src/uts/common/io/warlock/hid.wlcmd b/usr/src/uts/common/io/warlock/hid.wlcmd
deleted file mode 100644
index a1c469a5a9..0000000000
--- a/usr/src/uts/common/io/warlock/hid.wlcmd
+++ /dev/null
@@ -1,54 +0,0 @@
-
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-one hid_state
-
-### specify the root functions
-
-root hid_open
-root hid_close 
-root hid_interrupt_pipe_callback
-root hid_wsrv
-root hid_wput
-root hid_default_pipe_callback
-root hid_default_pipe_exception_callback
-root hid_interrupt_pipe_exception_callback
-root hid_restore_state_event_callback
-root hid_disconnect_event_callback
-root hid_power
-root hid_power_change_callback
-
-### polled functions
-root hid_polled_input_enter
-root hid_polled_input_exit
-root hid_polled_read
-
-### thread functions
-add        bus_ops::bus_add_eventcall targets warlock_dummy
-add        bus_ops::bus_get_eventcookie targets warlock_dummy
-add        bus_ops::bus_post_event targets warlock_dummy
-add        bus_ops::bus_remove_eventcall targets warlock_dummy
-add        bus_ops::bus_intr_ctl targets warlock_dummy
-add        bus_ops::bus_config targets warlock_dummy
-add        bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/hid_with_usba.wlcmd b/usr/src/uts/common/io/warlock/hid_with_usba.wlcmd
deleted file mode 100644
index e2253682d2..0000000000
--- a/usr/src/uts/common/io/warlock/hid_with_usba.wlcmd
+++ /dev/null
@@ -1,211 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-one hid_state
-one ohci_state
-one ehci_state
-one uhci_state
-one usba_pipe_handle_data
-one usba_ph_impl
-one hubd
-one usba_device
-
-### specify the root functions
-
-root	usb_console_output_init
-root	usb_console_output_fini
-root	usb_console_output_enter
-root	usb_console_output_exit
-root	usb_console_write
-root	usb_console_input_enter
-root	usb_console_input_exit
-root	usb_console_read
-root	usb_get_dev_descr
-root	usb_get_if_number
-root	usb_parse_CV_cfg_descr
-root	usb_parse_CV_ep_descr
-root	usb_parse_CV_if_descr
-root	usb_parse_comp_ep_descr
-root	usb_pipe_get_private
-root	usb_get_current_frame_number
-root	usb_get_max_isoc_pkts
-root	usb_pipe_set_private
-root	usb_rval2errno
-root	usb_req_raise_power
-root	usb_req_lower_power
-root	usb_set_device_pwrlvl0
-root	usb_set_device_pwrlvl1
-root	usb_set_device_pwrlvl2
-root	usb_set_device_pwrlvl3
-root	usb_is_pm_enabled
-root	usb_async_req
-root	usb_pipe_bulk_transfer_size
-root	usba_pipe_get_policy
-root	usb_pipe_ctrl_xfer_wait
-root	usb_pipe_drain_reqs
-root	usb_try_serialize_access
-root	usb_pipe_reset
-root    usb_alloc_bulk_req
-root    usb_clear_feature
-root    usb_free_bulk_req
-root    usb_get_alt_if
-root    usb_get_ep_descr
-root    usb_get_if_descr
-root    usb_pipe_bulk_xfer
-root    usb_pipe_isoc_xfer
-root    usb_pipe_stop_isoc_polling
-root    usb_set_alt_if
-root    usb_set_cfg
-root    usb_get_cfg
-root	usb_get_status
-root	usb_ep_num
-root	usb_clr_feature
-root	usb_get_ep_data
-root	usb_register_hotplug_cbs
-root	usb_get_current_cfgidx
-root	usb_register_client
-root	usb_reset_device
-root	usb_register_dev_driver
-root	usb_unregister_dev_driver
-
-root	usba_common_power
-root	usba_common_register_events
-root	usba_ready_interface_association_node
-root    usba_get_hc_dma_attr
-root    usba_hcdi_get_req_private
-root    usba_hcdi_set_req_private
-root	usba_pipe_do_async_func_thread
-root	usba_move_list
-root	usba_ready_interface_node
-root	usba_ascii_string_descr
-root	usba_free_hcdi_ops
-root	usba_async_req_raise_power
-root	usba_async_req_lower_power
-root	usba_taskq_destroy
-
-root	hcdi_autoclearing
-root	hcdi_cb_thread
-root	hcdi_shared_cb_thread
-root	hubd_disconnect_event_cb
-root	hubd_reconnect_event_cb
-
-root	hubd_hotplug_thread
-root	hubd_reset_thread
-root	hubd_cpr_post_user_callb
-
-root	ohci_intr
-root	ehci_intr
-
-root	ohci_quiesce
-root	uhci_quiesce
-root	ehci_quiesce
-
-root	usba_dbuf_tail
-root	usb_log
-root	hubd_restore_state_cb
-root	hubd_disconnect_event_cb
-root	hubd_bus_power
-root	usba_hubdi_power
-root	usba_hubdi_root_hub_power
-root	usba_get_hotplug_stats
-root	usba_reset_hotplug_stats
-root	usb_log_descr_tree
-root	usb_print_descr_tree
-root	hubd_root_hub_cleanup_thread
-
-root	usb_fini_serialization
-root	usb_init_serialization
-root	usb_release_access
-root	usb_serialize_access
-root	usba_mk_mctl
-root	usb_fail_checkpoint
-
-root	usb_ugen_attach
-root	usb_ugen_close
-root	usb_ugen_detach
-root	usb_ugen_disconnect_ev_cb
-root	usb_ugen_get_hdl
-root	usb_ugen_open
-root	usb_ugen_poll
-root	usb_ugen_power
-root	usb_ugen_read
-root	usb_ugen_reconnect_ev_cb
-root	usb_ugen_write
-
-### specify the hid root functions
-root hid_open
-root hid_close
-root hid_interrupt_pipe_callback
-root hid_wsrv
-root hid_wput
-root hid_default_pipe_callback
-root hid_default_pipe_exception_callback 
-root hid_interrupt_pipe_exception_callback 
-root hid_restore_state_event_callback
-root hid_disconnect_event_callback
-root hid_power
-root hid_power_change_callback
-
-
-### polled functions
-root hid_polled_input_enter
-root hid_polled_input_exit
-root hid_polled_read
-root usba_dbuf_tail
-
-### thread functions in hid module
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_close
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_reset
-
-add usba_pipe_async_req::callback targets warlock_dummy
-add usb_bulk_req::bulk_cb targets warlock_dummy
-add usb_bulk_req::bulk_exc_cb targets warlock_dummy
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-
-add usba_pm_req::cb targets warlock_dummy
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usba_hcdi_ops::usba_hcdi_console_input_init targets \
-                                                ohci_hcdi_polled_input_init
-add usba_hcdi_ops::usba_hcdi_console_input_fini targets \
-                                                ohci_hcdi_polled_input_fini
-
-add usba_hcdi_ops::usba_hcdi_console_input_init targets \
-                                                ehci_hcdi_polled_input_init
-add usba_hcdi_ops::usba_hcdi_console_input_fini targets \
-                                                ehci_hcdi_polled_input_fini
-
-add usba_hcdi_ops::usba_hcdi_console_input_init targets \
-						uhci_hcdi_polled_input_init
-add usba_hcdi_ops::usba_hcdi_console_input_fini targets \
-						uhci_hcdi_polled_input_fini
diff --git a/usr/src/uts/common/io/warlock/ib.wlcmd b/usr/src/uts/common/io/warlock/ib.wlcmd
deleted file mode 100644
index f78bc241c3..0000000000
--- a/usr/src/uts/common/io/warlock/ib.wlcmd
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-# ibnexus Callback handlers for IBDM
-add	ibdm.ibdm_ibnex_callback targets	ibnex_dm_callback
-
-# ibnnexus to ibtl callback functions
-ignore	ibnex_ibtl_callback
-root	ibnex_return_apid
-
-# ibnexus bus_ops entry points
-add	bus_ops::bus_config	targets warlock_dummy
-add	bus_ops::bus_unconfig	targets warlock_dummy
-
-# IBDM callback handlers from IBTL
-root	ibdm_event_hdlr
-
-# ibdm Callback handlers for IBMF / SAA
-root	ibdm_ibmf_recv_cb
-root	ibdm_ibmf_send_cb
-root	ibdm_recv_incoming_mad	
-root	ibdm_saa_event_cb
-root	ibdm_saa_handle_new_gid
-
-# ibnex reprobe function, called from taskq
-root	ibnex_handle_reprobe_dev
-root	ibnex_handle_hca_attach
-
-# ibnex other functions
-root	ibnex_name_child
-
-# ibdm function called from taskq
-root	ibdm_saa_event_taskq
-
-# ibnex MPXIO and PM related functions
-root	ib_vhci_failover
-root	ib_vhci_pi_init
-root	ib_vhci_pi_state_change
-root	ib_vhci_pi_uninit
-root	ibnex_bus_power
diff --git a/usr/src/uts/common/io/warlock/ibcm.wlcmd b/usr/src/uts/common/io/warlock/ibcm.wlcmd
deleted file mode 100644
index ffced96a68..0000000000
--- a/usr/src/uts/common/io/warlock/ibcm.wlcmd
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-# ibcm api entry points
-root	ibt_open_rc_channel
-root	ibt_close_rc_channel
-root	ibt_prime_close_rc_channel
-root	ibt_request_ud_dest
-root	ibt_ud_get_dqpn
-root	ibt_cm_delay
-root	ibt_register_service
-root	ibt_bind_service
-root	ibt_unbind_service
-root	ibt_unbind_all_services
-root	ibt_register_ar
-root	ibt_deregister_ar
-root	ibt_query_ar
-root	ibt_cm_proceed
-root	ibt_cm_ud_proceed
-root	ibt_deregister_service
-root	ibcm_query_classport_info
-root	ibt_free_mcg_info
-root	ibt_join_mcg
-root	ibcm_process_async_join_mcg
-root	ibt_leave_mcg
-root	ibt_query_mcg
-root	ibt_set_alt_path
-root	ibt_gid_to_node_info
-root	ibt_recycle_rc
-root	ibt_get_companion_port_gids
-root	ibt_get_paths
-root	ibt_get_alt_path
-root	ibt_aget_paths
-root	ibt_get_ip_paths
-root	ibt_aget_ip_paths
-root	ibt_get_ip_alt_path
-root	ibt_format_ip_private_data
-root	ibt_get_ip_data
-root	ibt_get_ip_dst_port
-root	ibt_get_ip_protocol_num
-root	ibt_get_ip_sid
-root	ibt_release_ip_sid 
-root	ibt_get_src_ip
-root	ibt_free_srcip_info
-root	ibt_lid_to_node_info
-
-root	ibt_ofuvcm_get_req_data
-root	ibt_ofuvcm_proceed
-
-# callback entry points from ibmf
-root	ibcm_recv_cb
-root	ibcm_post_req_complete
-root	ibcm_post_rep_complete
-root	ibcm_post_rep_wait_complete
-root	ibcm_post_mra_complete
-root	ibcm_post_mra_lap_complete
-root	ibcm_post_mra_rep_complete
-root	ibcm_post_rej_complete
-root	ibcm_post_lap_complete
-root	ibcm_post_apr_complete
-root	ibcm_post_stored_apr_complete
-root	ibcm_post_dreq_complete
-root	ibcm_post_drep_complete
-root	ibcm_post_rtu_complete
-root	ibcm_post_sidr_req_complete
-root	ibcm_post_sidr_rep_complete
-root	ibcm_resend_post_rep_complete
-
-# Callback handlers from IBTL
-root	ibcm_async_handler
-root	ibcm_ibtl_node_info
-root	ibt_register_subnet_notices
-
-# Callback handlers from ibcm
-root	ibcm_local_cm_handler
-
-# driver entry points
-
-root	_init
-root	_fini
-root	_info
-
-# AVL related callbacks
-
-root	ibcm_active_node_compare 
-root	ibcm_passive_node_compare
-root	ibcm_passive_comid_node_compare 
-
-# CM internal taskq related callbacks
-root	ibcm_proceed_via_taskq
-root	ibcm_ud_proceed_via_taskq
-root	ibcm_recv_task
-root	ibcm_init_saa
-root	ibcm_process_abort_via_taskq
-root	ibcm_process_async_get_paths
-root	ibcm_process_get_ip_paths
-root	ibcm_service_record_rewrite_task
-
-# kernel callbacks to ibcm
-
-root	ibcm_path_cache_timeout_cb
-root	ibcm_timeout_cb
-root	ibcm_recv_timeout_cb
-root	ibcm_sidr_timeout_cb
-root	ibcm_sm_notice_handler 
diff --git a/usr/src/uts/common/io/warlock/ibd.wlcmd b/usr/src/uts/common/io/warlock/ibd.wlcmd
deleted file mode 100644
index 45146e6811..0000000000
--- a/usr/src/uts/common/io/warlock/ibd.wlcmd
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-one	ibd_state_s
-
-### Async thread
-root	ibd_async_work
-
-### GLDv3 callback routines
-root	ibd_m_stat
-root	ibd_m_start
-root	ibd_m_stop
-root	ibd_m_promisc
-root	ibd_m_multicst
-root	ibd_m_unicst
-root	ibd_m_tx
-root	ibd_m_getcapab
-
-### IBTF callback routines
-root	ibd_rcq_handler
-root	ibd_scq_handler
-root	ibd_async_handler
-root	ibd_snet_notices_handler
-root	ibd_rc_rcq_handler
-root	ibd_rc_scq_handler
-root	ibd_rc_dispatch_pass_mad
-root	ibd_rc_dispatch_actv_mad
-
-### Streams callback funtions
-root	ibd_freemsg_cb
-root	ibd_rc_freemsg_cb
-root	ibd_rc_srq_freemsg_cb
-
-### Hash callback functions
-root	ibd_hash_by_id
-root	ibd_hash_key_cmp
-
-### Kstat functions
-root	ibd_rc_update_stats
-
-add     bus_ops::bus_add_eventcall 	targets warlock_dummy
-add     bus_ops::bus_get_eventcookie 	targets warlock_dummy
-add     bus_ops::bus_post_event 	targets warlock_dummy
-add     bus_ops::bus_remove_eventcall 	targets warlock_dummy
-add     bus_ops::bus_intr_ctl 		targets warlock_dummy
-add     bus_ops::bus_config             targets warlock_dummy
-add     bus_ops::bus_unconfig           targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/ibmf.wlcmd b/usr/src/uts/common/io/warlock/ibmf.wlcmd
deleted file mode 100644
index 76fe05f4ee..0000000000
--- a/usr/src/uts/common/io/warlock/ibmf.wlcmd
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-### specify the root functions
-root	ibmf_register
-root	ibmf_unregister
-root	ibmf_setup_async_cb
-root	ibmf_tear_down_async_cb
-root	ibmf_msg_transport
-root	ibmf_alloc_msg
-root	ibmf_free_msg
-root	ibmf_alloc_qp
-root	ibmf_query_qp
-root	ibmf_modify_qp
-root	ibmf_free_qp
-root	ibmf_i_mad_completions
-root	ibmf_i_do_send_cb
-root	ibmf_i_do_recv_cb
-root	ibmf_module_load
-root	ibmf_sa_session_open
-root	ibmf_sa_session_close
-root	ibmf_sa_access
-root	ibmf_saa_gid_to_pathrecords
-root	ibmf_saa_paths_from_gid
-root	ibmf_saa_name_to_service_record
-root	ibmf_saa_id_to_service_record
-root	ibmf_saa_update_service_record
-root	ibmf_recv_wqe_cache_constructor
-root	ibmf_send_wqe_cache_constructor
-root	ibmf_recv_wqe_cache_destructor
-root	ibmf_send_wqe_cache_destructor
-root    ibmf_altqp_recv_wqe_cache_constructor
-root    ibmf_altqp_recv_wqe_cache_destructor
-root    ibmf_altqp_send_wqe_cache_constructor
-root    ibmf_altqp_send_wqe_cache_destructor
-root	ibmf_saa_notify_event_client_task 
-root	ibmf_ibt_async_handler
-add	bus_ops::bus_add_eventcall targets warlock_dummy
-add	bus_ops::bus_get_eventcookie targets warlock_dummy
-add	bus_ops::bus_post_event targets warlock_dummy
-add	bus_ops::bus_remove_eventcall targets warlock_dummy
-add	bus_ops::bus_intr_ctl targets warlock_dummy
-add	ibmf_i_notify_client/async_cb	targets warlock_dummy
-add	ibmf_i_notify_client/async_cb	targets	ibmf_saa_report_cb
-add	_ibmf_msg_impl::im_trans_cb	targets warlock_dummy
-add	_ibmf_msg_impl::im_trans_cb	targets ibmf_saa_async_cb
-add	bus_ops::bus_config	targets warlock_dummy
-add	bus_ops::bus_unconfig	targets warlock_dummy
-add	ibmf_handlers.c:ibmf_i_callback_clients/cb_array	targets \
-	ibmf_saa_impl_async_event_cb
-add	ibmf_handlers.c:ibmf_i_callback_clients/cb_array	targets warlock_dummy
-add	ibmf_saa_event_taskq_args_s::et_callback	targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/ibtl.wlcmd b/usr/src/uts/common/io/warlock/ibtl.wlcmd
deleted file mode 100644
index 032dbcb0e6..0000000000
--- a/usr/src/uts/common/io/warlock/ibtl.wlcmd
+++ /dev/null
@@ -1,319 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-# IBTF TI and VTI api entry points
-root	ibt_attach
-root	ibt_detach
-root	ibc_init
-root	ibc_fini
-root	ibc_attach
-root	ibc_post_attach
-root	ibc_pre_detach
-root	ibc_detach
-root	ibt_ci_data_in
-root	ibt_ci_data_out
-root	ibt_usec2ib
-root	ibt_ib2usec
-root	ibt_register_mr
-root	ibt_register_buf
-root	ibt_query_mr
-root	ibt_deregister_mr
-root	ibt_reregister_mr
-root	ibt_reregister_buf
-root	ibt_register_shared_mr
-root	ibt_sync_mr
-root	ibt_alloc_mw
-root	ibt_query_mw
-root	ibt_free_mw
-root	ibt_alloc_lkey
-root	ibt_map_mem_area
-root	ibt_unmap_mem_area
-root	ibt_register_phys_mr
-root	ibt_reregister_phys_mr
-root	ibt_create_fmr_pool
-root	ibt_destroy_fmr_pool
-root	ibt_flush_fmr_pool
-root	ibt_register_physical_fmr
-root	ibt_deregister_fmr
-root	ibt_enable_cq_notify
-root	ibt_set_cq_handler
-root	ibt_query_cq_handler_id
-root	ibt_alloc_qp
-root	ibt_initialize_qp
-root	ibt_alloc_special_qp
-root	ibt_flush_qp
-root	ibt_free_qp
-root	ibt_query_qp
-root	ibt_modify_qp
-root	ibt_migrate_path
-root	ibt_set_qp_private
-root	ibt_get_qp_private
-root	ibt_qp_to_hca_guid
-root	ibt_recover_ud_qp
-root	ibt_pause_sendq
-root	ibt_unpause_sendq
-root	ibt_resize_queues
-root	ibt_query_queues
-root	ibt_modify_rdma
-root	ibt_set_rdma_resource
-root	ibt_change_port
-root	ibt_alloc_cq_sched
-root	ibt_free_cq_sched
-root	ibt_alloc_cq
-root	ibt_free_cq
-root	ibt_query_cq
-root	ibt_resize_cq
-root	ibt_modify_cq
-root	ibt_poll_cq
-root	ibt_set_cq_private
-root	ibt_get_cq_private
-root	ibt_post_send
-root	ibt_post_recv
-root	ibt_open_hca
-root	ibt_close_hca
-root	ibt_get_hca_list
-root	ibt_free_hca_list
-root	ibt_get_port_state
-root	ibt_get_port_state_byguid
-root	ibt_query_hca_byguid
-root	ibt_query_hca
-root	ibt_query_hca_ports
-root	ibt_query_hca_ports_byguid
-root	ibt_modify_system_image
-root	ibt_modify_system_image_byguid
-root	ibt_modify_port_byguid
-root	ibt_modify_port
-root	ibt_free_portinfo
-root	ibt_pkey2index
-root	ibt_pkey2index_byguid
-root	ibt_index2pkey
-root	ibt_index2pkey_byguid
-root	ibt_set_hca_private
-root	ibt_get_hca_private
-root	ibt_hca_handle_to_guid
-root	ibt_hca_guid_to_handle
-root	ibt_alloc_rc_channel
-root	ibt_query_rc_channel
-root	ibt_modify_rc_channel
-root	ibt_alloc_ud_channel
-root	ibt_alloc_ud_channel_range
-root	ibt_query_ud_channel
-root	ibt_modify_ud_channel
-root	ibt_recover_ud_channel
-root	ibt_flush_channel
-root	ibt_free_channel
-root	ibt_alloc_ud_dest
-root	ibt_query_ud_dest
-root	ibt_modify_ud_dest
-root	ibt_free_ud_dest
-root	ibt_modify_reply_ud_dest
-root	ibt_is_privileged_ud_dest
-root	ibt_update_channel_qkey
-root	ibt_set_chan_private
-root	ibt_get_chan_private
-root	ibt_channel_to_hca_guid
-root	ibt_alloc_pd
-root	ibt_free_pd
-root	ibt_alloc_ah
-root	ibt_free_ah
-root	ibt_query_ah
-root	ibt_modify_ah
-root	ibt_attach_mcg
-root	ibt_detach_mcg
-root	ibt_recycle_ud
-root	ibt_reprobe_dev
-root	ibt_alloc_srq
-root	ibt_free_srq
-root	ibt_modify_srq
-root	ibt_post_srq
-root	ibt_query_srq
-root	ibt_get_srq_private
-root	ibt_set_srq_private
-root	ibt_alloc_io_mem
-root	ibt_free_io_mem
-root	ibt_map_mem_iov
-root	ibt_unmap_mem_iov
-root	ibt_register_part_attr_cb
-root	ibt_unregister_part_attr_cb
-root	ibt_get_part_attr
-root	ibt_get_all_part_attr
-root	ibt_free_part_attr
-root	ibt_register_dma_mr
-
-# IBTF CI api entry points
-root	ibc_init
-root	ibc_fini
-root	ibc_attach
-root	ibc_pre_detach
-root	ibc_detach
-root	ibc_async_handler
-root	ibc_cq_handler
-
-# IBTF Debug entry points
-root	ibtl_dprintf_intr
-root	ibtl_dprintf5
-root	ibtl_dprintf4
-root	ibtl_dprintf3
-root	ibtl_dprintf2
-root	ibtl_dprintf1
-root	ibtl_dprintf0
-
-# IBTL-CM private interface
-root	ibtl_cm_sm_notice_init_failure
-root	ibtl_cm_sm_notice_handler
-root	ibtl_cm_set_sm_notice_handler
-root	ibtl_cm_chan_is_opening
-root	ibtl_cm_chan_open_is_aborted
-root	ibtl_cm_chan_is_open
-root	ibtl_cm_is_chan_closing
-root	ibtl_cm_chan_is_closing
-root	ibtl_cm_chan_is_closed
-root	ibtl_cm_chan_is_reused
-root	ibtl_cm_is_chan_closed
-root	ibtl_cm_query_hca_ports_byguid
-root	ibtl_cm_set_chan_private
-root	ibtl_cm_get_chan_private
-root	ibtl_cm_release_chan_private
-root	ibtl_cm_wait_chan_private
-root	ibtl_cm_get_chan_type
-root	ibtl_cm_change_service_cnt
-root	ibtl_cm_get_hca_port
-root	ibtl_cm_get_active_plist
-root	ibtl_cm_free_active_plist
-root	ibtl_cm_get_1st_full_pkey_ix
-root	ibtl_cm_get_local_comp_gids
-root	ibtl_cm_is_multi_sm
-root	ibtl_cm_set_node_info_cb
-root	ibtl_cm_get_clnt_name
-root	ibtl_dummy_node_info_cb
-
-# IBTL-IBNEX private interface
-root	ibtl_ibnex_get_hca_info
-root	ibtl_ibnex_register_callback
-root	ibtl_ibnex_unregister_callback
-root	ibtl_ibnex_hcadip2guid
-root	ibtl_ibnex_hcaguid2dip
-root	ibtl_ibnex_get_hca_verbose_data
-root	ibtl_ibnex_valid_hca_parent
-root	ibtl_ibnex_query_hca_byguid
-
-# IBTL internal taskq related callbacks
-root	ibtl_do_mgr_async_task
-root	ibtl_hca_client_async_task
-root	ibtl_tell_client_about_new_hca
-root	ibtl_sm_notice_task
-root	ibt_cisco_embedded_sm_rereg_fix
-
-# IBTL internal threads
-root	ibtl_async_thread
-root	ibtl_cq_thread
-
-# IBTL FMA Hooks
-root	ibc_get_ci_failure
-root	ibt_get_module_failure
-root	ibt_check_failure
-
-# IBTL kstat callback
-root	ibtl_kstat_stats_update
-root	ibtl_kstat_pkeys_update
-
-
-
-# Internal, but not referenced (n the future, maybe)
-root	ibtl_free_eec_async_check
-
-add	ibc_operations_s::ibc_alloc_ah			targets	warlock_dummy
-add	bus_ops::bus_add_eventcall			targets	warlock_dummy
-add	bus_ops::bus_config				targets	warlock_dummy
-add	bus_ops::bus_get_eventcookie			targets	warlock_dummy
-add	bus_ops::bus_intr_ctl				targets	warlock_dummy
-add	bus_ops::bus_post_event				targets	warlock_dummy
-add	bus_ops::bus_remove_eventcall			targets	warlock_dummy
-add	bus_ops::bus_unconfig				targets	warlock_dummy
-add	ibc_operations_s::ibc_alloc_cq			targets	warlock_dummy
-add	ibc_operations_s::ibc_alloc_cq_sched		targets	warlock_dummy
-add	ibc_operations_s::ibc_alloc_mw			targets	warlock_dummy
-add	ibc_operations_s::ibc_alloc_pd			targets	warlock_dummy
-add	ibc_operations_s::ibc_alloc_qp			targets	warlock_dummy
-add	ibc_operations_s::ibc_alloc_qp_range		targets	warlock_dummy
-add	ibc_operations_s::ibc_alloc_special_qp		targets	warlock_dummy
-add	ibc_operations_s::ibc_attach_mcg		targets	warlock_dummy
-add	ibc_operations_s::ibc_ci_data_in		targets	warlock_dummy
-add	ibc_operations_s::ibc_ci_data_out		targets	warlock_dummy
-add	ibc_operations_s::ibc_deregister_mr		targets	warlock_dummy
-add	ibc_operations_s::ibc_detach_mcg		targets	warlock_dummy
-add	ibc_operations_s::ibc_free_ah			targets	warlock_dummy
-add	ibc_operations_s::ibc_free_cq			targets	warlock_dummy
-add	ibc_operations_s::ibc_free_cq_sched		targets	warlock_dummy
-add	ibc_operations_s::ibc_free_mw			targets	warlock_dummy
-add	ibc_operations_s::ibc_free_pd			targets	warlock_dummy
-add	ibc_operations_s::ibc_free_qp			targets	warlock_dummy
-add	ibc_operations_s::ibc_modify_ah			targets	warlock_dummy
-add	ibc_operations_s::ibc_modify_cq			targets	warlock_dummy
-add	ibc_operations_s::ibc_modify_ports		targets	warlock_dummy
-add	ibc_operations_s::ibc_modify_qp			targets	warlock_dummy
-add	ibc_operations_s::ibc_modify_system_image	targets	warlock_dummy
-add	ibc_operations_s::ibc_notify_cq			targets	warlock_dummy
-add	ibc_operations_s::ibc_poll_cq			targets	warlock_dummy
-add	ibc_operations_s::ibc_post_recv			targets	warlock_dummy
-add	ibc_operations_s::ibc_post_send			targets	warlock_dummy
-add	ibc_operations_s::ibc_query_ah			targets	warlock_dummy
-add	ibc_operations_s::ibc_query_cq			targets	warlock_dummy
-add	ibc_operations_s::ibc_query_cq_handler_id	targets	warlock_dummy
-add	ibc_operations_s::ibc_query_hca_ports		targets	warlock_dummy
-add	ibc_operations_s::ibc_query_mr			targets	warlock_dummy
-add	ibc_operations_s::ibc_query_mw			targets	warlock_dummy
-add	ibc_operations_s::ibc_query_qp			targets	warlock_dummy
-add	ibc_operations_s::ibc_register_buf		targets	warlock_dummy
-add	ibc_operations_s::ibc_register_mr		targets	warlock_dummy
-add	ibc_operations_s::ibc_register_shared_mr	targets	warlock_dummy
-add	ibc_operations_s::ibc_release_qpn		targets	warlock_dummy
-add	ibc_operations_s::ibc_reregister_buf		targets	warlock_dummy
-add	ibc_operations_s::ibc_reregister_mr		targets	warlock_dummy
-add	ibc_operations_s::ibc_resize_cq			targets	warlock_dummy
-add	ibc_operations_s::ibc_sync_mr			targets	warlock_dummy
-add	ibc_operations_s::ibc_alloc_srq			targets warlock_dummy
-add	ibc_operations_s::ibc_free_srq			targets warlock_dummy
-add	ibc_operations_s::ibc_modify_srq		targets warlock_dummy
-add	ibc_operations_s::ibc_post_srq			targets warlock_dummy
-add	ibc_operations_s::ibc_query_srq			targets warlock_dummy
-add	ibc_operations_s::ibc_map_mem_area		targets warlock_dummy
-add	ibc_operations_s::ibc_unmap_mem_area		targets warlock_dummy
-add	ibc_operations_s::ibc_alloc_lkey		targets warlock_dummy
-add	ibc_operations_s::ibc_register_physical_mr	targets warlock_dummy
-add	ibc_operations_s::ibc_reregister_physical_mr	targets warlock_dummy
-add	ibc_operations_s::ibc_create_fmr_pool		targets warlock_dummy
-add	ibc_operations_s::ibc_destroy_fmr_pool		targets warlock_dummy
-add	ibc_operations_s::ibc_flush_fmr_pool		targets warlock_dummy
-add	ibc_operations_s::ibc_register_physical_fmr	targets warlock_dummy
-add	ibc_operations_s::ibc_deregister_fmr		targets warlock_dummy
-add	ibc_operations_s::ibc_alloc_io_mem		targets warlock_dummy
-add	ibc_operations_s::ibc_free_io_mem		targets warlock_dummy
-add	ibc_operations_s::ibc_map_mem_iov		targets warlock_dummy
-add	ibc_operations_s::ibc_unmap_mem_iov		targets warlock_dummy
-add	ibc_operations_s::ibc_register_dma_mr		targets warlock_dummy
-add	ibt_clnt_modinfo_s::mi_async_handler		targets	warlock_dummy
-add	ibtl_handlers.c:ibtl_async_client_call/async_handler	targets	warlock_dummy
-add	ibtl_handlers.c:ibtl_cq_handler_call/cq_handler	targets	warlock_dummy
-add	ibtl_handlers.c:ibtl_sm_notice_task/sm_notice_handler	targets	warlock_dummy
-add	ibtl_mgr_s::mgr_async_handler			targets	warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/ifp.wlcmd b/usr/src/uts/common/io/warlock/ifp.wlcmd
deleted file mode 100644
index 2bceed5926..0000000000
--- a/usr/src/uts/common/io/warlock/ifp.wlcmd
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-### Warlock commands for analyzing the ifp driver alone.
-
-### Tell warlock there's only one ifp struct, so that it will complain
-### if the lock is acquired when it is already locked.
-
-one ifp 
-
-### Tell warlock that ifp_scsi_reset_notify(), which gets called from
-### the scsa stuff through the transport table, is a root function.
-
-root ifp_scsi_reset_notify
-root ifp_ifptm_alive
-root ifp_ifptm_attach
-root ifp_ifptm_detach
-root ifp_ifptm_init
-root ifp_ifptm_mbox_cmd_init
-root ifp_ifptm_mbox_cmd_start
-root ifp_ifptm_reset
-
-ignore ifp.c:ifp_hp_daemon
-
-### Give warlock the lock order we use to prevent deadlocks.
-
-assert order \
-	ifp::ifp_response_mutex \
-	ifp::ifp_request_mutex \
-	ifp::ifp_waitq_mutex
-
-### Tell warlock not to analyze this calling sequence, since it
-### never really occurs.
-
-disallow \
-	ifp_i_empty_waitQ \
-	ifp_scsi_start \
-	ifp_i_polled_cmd_start
-
-ignore ifp_kmem_cache_constructor ifp_kmem_cache_destructor
-ignore ifp_i_print_fcal_position_map
-ignore ifp_bus_get_eventcookie ifp_bus_add_eventcall ifp_bus_remove_eventcall
-ignore ifp_bus_post_event
-ignore ifp_i_print_state
-ignore ifp_scsi_get_name ifp_scsi_get_bus_addr
-ignore ifp_kstat_update
-
-### Tell warlock where calls through pkt_comp go.
-
-add scsi_pkt::pkt_comp targets \
-	ifp_scsi_start \
-	ifp_scsi_abort \
-	ifp_scsi_reset \
-	ifp_scsi_getcap \
-	ifp_scsi_setcap \
-	ifp_scsi_dmafree \
-	ifp_scsi_sync_pkt \
-	ifp_scsi_destroy_pkt \
-	ifp_scsi_init_pkt
-
-add notify_entry::callback target warlock_dummy
-
-### pointers in the scsi_hba_tran structure.
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-root    scsi_hba_bus_power
-
diff --git a/usr/src/uts/common/io/warlock/isp.wlcmd b/usr/src/uts/common/io/warlock/isp.wlcmd
deleted file mode 100644
index 1a2c4b11f1..0000000000
--- a/usr/src/uts/common/io/warlock/isp.wlcmd
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-### Warlock commands for analyzing the isp driver alone.
-
-### Tell warlock there's only one isp struct, so that it will complain
-### if the lock is acquired when it is already locked.
-
-one isp 
-
-### Tell warlock that isp_scsi_reset_notify(), which gets called from
-### the scsa stuff through the transport table, is a root function.
-
-root isp_scsi_reset_notify isp_i_print_response
-
-### Give warlock the lock order we use to prevent deadlocks.
-
-assert order \
-	isp::isp_response_mutex \
-	isp::isp_request_mutex \
-	isp::isp_waitq_mutex
-
-### Tell warlock not to analyze this calling sequence, since it
-### never really occurs.
-
-disallow \
-	isp_i_empty_waitQ \
-	isp_scsi_start \
-	isp_i_polled_cmd_start
-
-root isp_kmem_cache_constructor isp_kmem_cache_destructor
-
-### Tell warlock where calls through pkt_comp go.
-
-add scsi_pkt::pkt_comp targets \
-	isp_scsi_start \
-	isp_scsi_abort \
-	isp_scsi_reset \
-	isp_scsi_getcap \
-	isp_scsi_setcap \
-	isp_scsi_dmafree \
-	isp_scsi_sync_pkt \
-	isp_scsi_destroy_pkt \
-	isp_scsi_init_pkt
-
-add notify_entry::callback target warlock_dummy
-
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done 
-root	scsi_hba_bus_power 
diff --git a/usr/src/uts/common/io/warlock/mpt.wlcmd b/usr/src/uts/common/io/warlock/mpt.wlcmd
deleted file mode 100644
index 880db2a1bc..0000000000
--- a/usr/src/uts/common/io/warlock/mpt.wlcmd
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-one mpt
-
-add scsi_pkt::pkt_comp targets \
-	mpt_scsi_destroy_pkt \
-	mpt_scsi_init_pkt \
-	mpt_scsi_start \
-	mpt_scsi_abort \
-	mpt_scsi_reset \
-	mpt_scsi_setcap \
-	mpt_scsi_getcap \
-	mpt_scsi_dmafree \
-	mpt_scsi_reset_notify \
-	mpt_scsi_tgt_init \
-	mpt_scsi_tgt_free \
-	mpt_scsi_sync_pkt \
-	mpt_smp_start \
-	mpt_sas_getcap
-
-add notify_entry::callback target warlock_dummy
-
-root mpt_kmem_cache_constructor mpt_kmem_cache_destructor
-root mpt_handle_event
-root mpt_handle_dr
-root mpt_name_child
-root mpt_fm_error_cb
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-
-root    scsi_hba_bus_power
-ignore  delay 
diff --git a/usr/src/uts/common/io/warlock/mptsas.wlcmd b/usr/src/uts/common/io/warlock/mptsas.wlcmd
deleted file mode 100644
index a30cfcd74e..0000000000
--- a/usr/src/uts/common/io/warlock/mptsas.wlcmd
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-add	bus_ops::bus_add_eventcall	target	warlock_dummy
-add	bus_ops::bus_config		target  warlock_dummy
-add	bus_ops::bus_get_eventcookie	target  warlock_dummy
-add	bus_ops::bus_intr_ctl		target  warlock_dummy
-add	bus_ops::bus_post_event		target  warlock_dummy
-add	bus_ops::bus_remove_eventcall	target  warlock_dummy
-add	bus_ops::bus_unconfig		target  warlock_dummy
-
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-
-root    scsi_hba_bus_power
-ignore  delay 
diff --git a/usr/src/uts/common/io/warlock/mv.wlcmd b/usr/src/uts/common/io/warlock/mv.wlcmd
deleted file mode 100644
index 5664a92e29..0000000000
--- a/usr/src/uts/common/io/warlock/mv.wlcmd
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# usr/src/uts/sparc/marvell88sx/mv.wlcmd
-
-one 	mv_ctl
-one 	mv_subctlr
-one 	mv_port_state
-
-one     scsi_device
-one     __ddi_xbuf_attr
-one     sd_lun
-one     sd_resv_reclaim_request
-
-root    sata_hba_ioctl
-root    sata_hba_open
-root    sata_hba_close
-root    sata_scsi_reset
-root    sata_scsi_init_pkt
-root    sata_scsi_start
-root    sata_scsi_destroy_pkt
-root    sata_scsi_sync_pkt
-root	sata_scsi_tgt_init
-root	sata_scsi_tgt_free
-root	sata_scsi_tgt_probe
-root    sata_scsi_dmafree
-root    sata_scsi_abort
-root    sata_scsi_getcap
-root    sata_scsi_setcap
-
-add     sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-root    sd.c:sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root    sd.c:sd_wm_cache_constructor sd_wm_cache_destructor
-root	sd.c:sd_read_modify_write_task sd_reenable_dsense_task
-root	sd.c:sd_failfast_flushq_callback sd_start_direct_priority_command
-root	sd.c:sdstrategy sdioctl
-root	sd.c:sd_target_change_task
-
-root	scsi_hba.c:scsi_hba_bus_power
-
-ignore  sd.c:sd_scsi_probe_cache_fini
-ignore  sd.c:sd_scsi_probe_cache_init
-ignore  sd.c:sd_scsi_target_lun_fini
-ignore  sd.c:sd_scsi_target_lun_init
-
-root    sd.c:sd_taskq_create
-root    sd.c:sd_taskq_delete
-
-
-add     bus_ops::bus_add_eventcall		targets warlock_dummy
-add     bus_ops::bus_config			targets warlock_dummy
-add     bus_ops::bus_get_eventcookie		targets warlock_dummy
-add     bus_ops::bus_intr_ctl			targets warlock_dummy
-add     bus_ops::bus_post_event			targets warlock_dummy
-add     bus_ops::bus_remove_eventcall		targets warlock_dummy
-add     bus_ops::bus_unconfig			targets warlock_dummy
-
-
-add     scsi_hba_tran::tran_tgt_init    targets sata_scsi_tgt_init
-add     scsi_hba_tran::tran_tgt_probe   targets sata_scsi_tgt_probe
-add     scsi_hba_tran::tran_tgt_free    targets sata_scsi_tgt_free
-add     scsi_hba_tran::tran_start       targets sata_scsi_start
-add     scsi_hba_tran::tran_abort       targets sata_scsi_abort
-add     scsi_hba_tran::tran_reset       targets sata_scsi_reset
-add     scsi_hba_tran::tran_getcap      targets sata_scsi_getcap
-add     scsi_hba_tran::tran_setcap      targets sata_scsi_setcap
-add     scsi_hba_tran::tran_init_pkt    targets sata_scsi_init_pkt
-add     scsi_hba_tran::tran_destroy_pkt targets sata_scsi_destroy_pkt
-
-add     scsi_hba_tran::tran_add_eventcall       targets warlock_dummy
-add     scsi_hba_tran::tran_bus_config          targets warlock_dummy
-add     scsi_hba_tran::tran_bus_power           targets warlock_dummy
-add     scsi_hba_tran::tran_bus_unconfig        targets warlock_dummy
-add     scsi_hba_tran::tran_get_eventcookie     targets warlock_dummy
-add     scsi_hba_tran::tran_get_name            targets warlock_dummy
-add     scsi_hba_tran::tran_post_event          targets warlock_dummy
-add     scsi_hba_tran::tran_remove_eventcall    targets warlock_dummy
-
-root    scsi_hba.c:scsi_hba_bus_power
-
-
-add	dk_callback::dkc_callback		targets warlock_dummy
-add	sd_uscsi_info::ui_dkc.dkc_callback	targets warlock_dummy
- 
-add scsi_watch_request::swr_callback targets \
-        sd.c:sd_mhd_watch_cb \
-        sd.c:sd_media_watch_cb
-
-add scsi_pkt::pkt_comp targets \
-	scsi_watch.c:scsi_watch_request_intr \
-	sd.c:sdintr \
-        sata_scsi_destroy_pkt \
-        sata_scsi_init_pkt \
-        sata_scsi_start \
-        sata_scsi_abort \
-        sata_scsi_reset \
-	sata_scsi_start
-
-add     __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-ignore	sd.c:sd_mhd_reset_notify_cb
-
-assert order    mv_ctl::mv_ctl_mutex mv_subctlr::mv_subctrl_mutex mv_port_state::mv_port_mutex
-
diff --git a/usr/src/uts/common/io/warlock/nv_sata.wlcmd b/usr/src/uts/common/io/warlock/nv_sata.wlcmd
deleted file mode 100644
index c77cca7b70..0000000000
--- a/usr/src/uts/common/io/warlock/nv_sata.wlcmd
+++ /dev/null
@@ -1,121 +0,0 @@
-# CDDL HEADER START
-# 
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# usr/src/uts/common/io/warlock/nv_sata.wlcmd
-
-one 	nv_ctl
-one 	nv_port
-
-one     scsi_device
-one     __ddi_xbuf_attr
-one     sd_lun
-one     sd_resv_reclaim_request
-
-root    sata_hba_ioctl
-root    sata_hba_open
-root    sata_hba_close
-root    sata_scsi_reset
-root    sata_scsi_init_pkt
-root    sata_scsi_start
-root    sata_scsi_destroy_pkt
-root    sata_scsi_sync_pkt
-root	sata_scsi_tgt_init
-root	sata_scsi_tgt_free
-root	sata_scsi_tgt_probe
-root    sata_scsi_dmafree
-root    sata_scsi_abort
-root    sata_scsi_getcap
-root    sata_scsi_setcap
-
-add     sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-root    sd.c:sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root    sd.c:sd_wm_cache_constructor sd_wm_cache_destructor
-root	sd.c:sd_read_modify_write_task sd_reenable_dsense_task
-root	sd.c:sd_failfast_flushq_callback sd_start_direct_priority_command
-root	sd.c:sdstrategy sdioctl
-root	sd.c:sd_target_change_task
-
-root	scsi_hba.c:scsi_hba_bus_power
-
-ignore  sd.c:sd_scsi_probe_cache_fini
-ignore  sd.c:sd_scsi_probe_cache_init
-ignore  sd.c:sd_scsi_target_lun_fini
-ignore  sd.c:sd_scsi_target_lun_init
-root    sd.c:sd_taskq_create
-root    sd.c:sd_taskq_delete
-
-add     bus_ops::bus_add_eventcall		targets warlock_dummy
-add     bus_ops::bus_config			targets warlock_dummy
-add     bus_ops::bus_get_eventcookie		targets warlock_dummy
-add     bus_ops::bus_intr_ctl			targets warlock_dummy
-add     bus_ops::bus_post_event			targets warlock_dummy
-add     bus_ops::bus_remove_eventcall		targets warlock_dummy
-add     bus_ops::bus_unconfig			targets warlock_dummy
-
-
-add     scsi_hba_tran::tran_tgt_init    targets sata_scsi_tgt_init
-add     scsi_hba_tran::tran_tgt_probe   targets sata_scsi_tgt_probe
-add     scsi_hba_tran::tran_tgt_free    targets sata_scsi_tgt_free
-add     scsi_hba_tran::tran_start       targets sata_scsi_start
-add     scsi_hba_tran::tran_abort       targets sata_scsi_abort
-add     scsi_hba_tran::tran_reset       targets sata_scsi_reset
-add     scsi_hba_tran::tran_getcap      targets sata_scsi_getcap
-add     scsi_hba_tran::tran_setcap      targets sata_scsi_setcap
-add     scsi_hba_tran::tran_init_pkt    targets sata_scsi_init_pkt
-add     scsi_hba_tran::tran_destroy_pkt targets sata_scsi_destroy_pkt
-
-add     scsi_hba_tran::tran_add_eventcall       targets warlock_dummy
-add     scsi_hba_tran::tran_bus_config          targets warlock_dummy
-add     scsi_hba_tran::tran_bus_power           targets warlock_dummy
-add     scsi_hba_tran::tran_bus_unconfig        targets warlock_dummy
-add     scsi_hba_tran::tran_get_eventcookie     targets warlock_dummy
-add     scsi_hba_tran::tran_get_name            targets warlock_dummy
-add     scsi_hba_tran::tran_post_event          targets warlock_dummy
-add     scsi_hba_tran::tran_remove_eventcall    targets warlock_dummy
-
-root    scsi_hba.c:scsi_hba_bus_power
-
-
-add	dk_callback::dkc_callback		targets warlock_dummy
-add	sd_uscsi_info::ui_dkc.dkc_callback	targets warlock_dummy
- 
-add scsi_watch_request::swr_callback targets \
-        sd.c:sd_mhd_watch_cb \
-        sd.c:sd_media_watch_cb
-
-add scsi_pkt::pkt_comp targets \
-	scsi_watch.c:scsi_watch_request_intr \
-	sd.c:sdintr \
-        sata_scsi_destroy_pkt \
-        sata_scsi_init_pkt \
-        sata_scsi_start \
-        sata_scsi_abort \
-        sata_scsi_reset \
-	sata_scsi_start
-
-add     __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-ignore	sd.c:sd_mhd_reset_notify_cb
diff --git a/usr/src/uts/common/io/warlock/ohci.wlcmd b/usr/src/uts/common/io/warlock/ohci.wlcmd
deleted file mode 100644
index f5a9cf1261..0000000000
--- a/usr/src/uts/common/io/warlock/ohci.wlcmd
+++ /dev/null
@@ -1,97 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-
-one ohci_state
-one usba_device
-one usba_pipe_handle_data
-one usba_ph_impl
-
-### specify the root functions 
-
-### hcdi entry points
-root	ohci_hcdi_pipe_open 
-root	ohci_hcdi_pipe_close 
-root	ohci_hcdi_pipe_stop_intr_polling 
-root	ohci_hcdi_pipe_stop_isoc_polling 
-root	ohci_hcdi_pipe_reset
-root	ohci_hcdi_pipe_reset_data_toggle
-root	ohci_hcdi_bulk_transfer_size
-root	ohci_hcdi_get_current_frame_number
-root	ohci_hcdi_get_max_isoc_pkts
-root	ohci_intr
-root	ohci_hcdi_pipe_ctrl_xfer
-root	ohci_hcdi_pipe_bulk_xfer
-root	ohci_hcdi_pipe_intr_xfer
-root	ohci_hcdi_pipe_isoc_xfer
-root	ohci_hcdi_pm_support
-root	ohci_quiesce
-
-root 	hubd_hotplug_thread
-root 	hubd_exception_cb
-root 	hubd_read_cb
-root 	hubd_disconnect_event_cb
-root 	hubd_post_resume_event_cb
-root 	hubd_pre_suspend_event_cb
-root 	hubd_reconnect_event_cb
-root	hubd_bus_power
-root	hcdi_cb_thread
-root	hcdi_shared_cb_thread
-
-### POLLED entry points
-root   ohci_hcdi_polled_input_init
-root   ohci_hcdi_polled_input_fini
-root   ohci_hcdi_polled_input_enter
-root   ohci_hcdi_polled_input_exit
-root   ohci_hcdi_polled_read
-root   ohci_hcdi_polled_output_init
-root   ohci_hcdi_polled_output_fini
-root   ohci_hcdi_polled_output_enter
-root   ohci_hcdi_polled_output_exit
-root   ohci_hcdi_polled_write
- 
-### currently unused functions
- 
-root	ohci_print_ed
-root	ohci_print_td
-root	usba_pipe_sync_close
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add usba_hcdi_ops::usba_hcdi_console_input_init targets \
-						ohci_hcdi_polled_input_init
-add usba_hcdi_ops::usba_hcdi_console_input_fini targets \
-						ohci_hcdi_polled_input_fini
-add usb_bulk_req::bulk_cb targets warlock_dummy
-add usb_bulk_req::bulk_exc_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-add usb_intr_req::intr_cb targets hubd_read_cb
-add usb_intr_req::intr_exc_cb targets hubd_exception_cb
diff --git a/usr/src/uts/common/io/warlock/rdsv3.wlcmd b/usr/src/uts/common/io/warlock/rdsv3.wlcmd
deleted file mode 100644
index 8b50fb6de5..0000000000
--- a/usr/src/uts/common/io/warlock/rdsv3.wlcmd
+++ /dev/null
@@ -1,365 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-# entry points
-root	_init
-root	_info
-root	_fini
-root	__rdsv3_conn_create
-root	__rdsv3_conn_error
-root	__rdsv3_ib_conn_error
-root	__rdsv3_ib_destroy_conns
-root	__rdsv3_ib_ring_empty
-root	__rdsv3_ib_ring_used
-root	__rdsv3_ib_teardown_mr
-root	__rdsv3_put_mr_final
-root	__rdsv3_rdma_map
-root	__rdsv3_rdma_send_complete
-root	__rdsv3_wake_sk_sleep
-root	_fini
-root	_info
-root	_init
-root	ib_addr_get_dgid
-root	ib_addr_get_mgid
-root	ib_addr_get_pkey
-root	ib_addr_get_sgid
-root	ib_addr_set_dgid
-root	ib_addr_set_pkey
-root	ib_addr_set_sgid
-root	ib_width_enum_to_int
-root	init_genlist
-root	ip_addr_size
-root	rdsv3_activate
-root	rdsv3_add_bound
-root	rdsv3_attach
-root	rdsv3_bind
-root	rdsv3_bind_node_compare
-root	rdsv3_bind_tree_exit
-root	rdsv3_bind_tree_init
-root	rdsv3_bind_tree_walk
-root	rdsv3_cancel_delayed_work
-root	rdsv3_capable_interface
-root	rdsv3_clear_print_buf
-root	rdsv3_clear_recv_queue
-root	rds_clif_name
-root	rdsv3_clrflowctrl
-root	rdsv3_cmsg_rdma_args
-root	rdsv3_cmsg_rdma_dest
-root	rdsv3_cmsg_rdma_map
-root	rdsv3_cmsg_recv
-root	rdsv3_cmsg_send
-root	rdsv3_cong_add_conn
-root	rdsv3_cong_add_socket
-root	rdsv3_cong_clear_bit
-root	rdsv3_cong_compare
-root	rdsv3_cong_exit
-root	rdsv3_cong_from_addr
-root	rdsv3_cong_get_maps
-root	rdsv3_cong_init
-root	rdsv3_cong_map_updated
-root	rdsv3_cong_monitor
-root	rdsv3_cong_queue_updates
-root	rdsv3_cong_remove_conn
-root	rdsv3_cong_remove_socket
-root	rdsv3_cong_set_bit
-root	rdsv3_cong_test_bit
-root	rdsv3_cong_tree_walk
-root	rdsv3_cong_update_alloc
-root	rdsv3_cong_updated_since
-root	rdsv3_cong_wait
-root	rdsv3_conn_compare
-root	rdsv3_conn_constructor
-root	rdsv3_conn_create
-root	rdsv3_conn_create_outgoing
-root	rdsv3_conn_destroy
-root	rdsv3_conn_destructor
-root	rdsv3_conn_drop
-root	rdsv3_conn_exit
-root	rdsv3_conn_info
-root	rdsv3_conn_info_visitor
-root	rdsv3_conn_init
-root	rdsv3_conn_is_sending
-root	rdsv3_conn_lookup
-root	rdsv3_conn_message_info
-root	rdsv3_conn_message_info_retrans
-root	rdsv3_conn_message_info_send
-root	rdsv3_conn_transition
-root	rdsv3_connect
-root	rdsv3_connect_complete
-root	rdsv3_connect_worker
-root	rdsv3_create_singlethread_workqueue
-root	rdsv3_destroy_mr
-root	rdsv3_destroy_workqueue
-root	rdsv3_detach
-root	rdsv3_do_ip_ioctl
-root	rdsv3_dprintf_intr
-root	rdsv3_dprintf0
-root	rdsv3_dprintf1
-root	rdsv3_dprintf2
-root	rdsv3_dprintf3
-root	rdsv3_dprintf4
-root	rdsv3_dprintf5
-root	rdsv3_exit
-root	rdsv3_fast_ip_csum
-root	rdsv3_find_bound
-root	rdsv3_flush_workqueue
-root	rdsv3_for_each_conn_info
-root	rdsv3_free_mr
-root	rdsv3_get_mr
-root	rdsv3_getname
-root	rdsv3_getpeername
-root	rdsv3_getsockopt
-root	rdsv3_ib_ack_send_complete
-root	rdsv3_ib_add_conn
-root	rdsv3_ib_add_ipaddr
-root	rdsv3_ib_add_one
-root	rdsv3_ib_advertise_credits
-root	rdsv3_ib_alloc_fmr
-root	rdsv3_ib_alloc_hdrs
-root	rdsv3_ib_attempt_ack
-root	rdsv3_ib_cm_connect_complete
-root	rdsv3_ib_cm_fill_conn_param
-root	rdsv3_ib_cm_handle_connect
-root	rdsv3_ib_cm_initiate_connect
-root	rdsv3_ib_cong_recv
-root	rdsv3_ib_conn_alloc
-root	rdsv3_ib_conn_connect
-root	rdsv3_ib_conn_free
-root	rdsv3_ib_conn_info_visitor
-root	rdsv3_ib_conn_shutdown
-root	rdsv3_ib_cq_event_handler
-root	rdsv3_ib_destroy_conns
-root	rdsv3_ib_destroy_nodev_conns
-root	rdsv3_ib_dma_map_sg
-root	rdsv3_ib_dma_map_sg_rdma
-root	rdsv3_ib_dma_unmap_sg
-root	rdsv3_ib_dma_unmap_sg_rdma
-root	rdsv3_ib_exit
-root	rdsv3_ib_flush_mr_pool
-root	rdsv3_ib_flush_mrs
-root	rdsv3_ib_frag_drop_page
-root	rdsv3_ib_frag_free
-root	rdsv3_ib_free_hdrs
-root	rdsv3_ib_free_mr
-root	rdsv3_ib_get_ack
-root	rdsv3_ib_get_device
-root	rdsv3_ib_get_header
-root	rdsv3_ib_get_mr
-root	rdsv3_ib_get_mr_info
-root	rdsv3_ib_ic_info
-root	rdsv3_ib_inc_copy_to_user
-root	rdsv3_ib_inc_free
-root	rdsv3_ib_inc_purge
-root	rdsv3_ib_init
-root	rdsv3_ib_laddr_check
-root	rdsv3_ib_map_fmr
-root	rdsv3_ib_piggyb_ack
-root	rdsv3_ib_process_recv
-root	rdsv3_ib_protocol_compatible
-root	rdsv3_ib_qp_event_handler
-root	rdsv3_ib_recv
-root	rdsv3_ib_recv_clear_one
-root	rdsv3_ib_recv_clear_ring
-root	rdsv3_ib_recv_cq_comp_handler
-root	rdsv3_ib_recv_exit
-root	rdsv3_ib_recv_init
-root	rdsv3_ib_recv_init_ack
-root	rdsv3_ib_recv_init_ring
-root	rdsv3_ib_recv_refill
-root	rdsv3_ib_recv_refill_one
-root	rdsv3_ib_recv_unmap_page
-root	rdsv3_ib_remove_conn
-root	rdsv3_ib_remove_ipaddr
-root	rdsv3_ib_remove_one
-root	rdsv3_ib_ring_alloc
-root	rdsv3_ib_ring_completed
-root	rdsv3_ib_ring_empty
-root	rdsv3_ib_ring_free
-root	rdsv3_ib_ring_init
-root	rdsv3_ib_ring_low
-root	rdsv3_ib_ring_oldest
-root	rdsv3_ib_ring_resize
-root	rdsv3_ib_ring_unalloc
-root	rdsv3_ib_send_ack
-root	rdsv3_ib_send_add_credits
-root	rdsv3_ib_send_clear_ring
-root	rdsv3_ib_send_cq_comp_handler
-root	rdsv3_ib_send_grab_credits
-root	rdsv3_ib_send_init_ring
-root	rdsv3_ib_send_rdma_complete
-root	rdsv3_ib_send_unmap_rdma
-root	rdsv3_ib_send_unmap_rm
-root	rdsv3_ib_set_ack
-root	rdsv3_ib_set_flow_control
-root	rdsv3_ib_set_protocol
-root	rdsv3_ib_setup_qp
-root	rdsv3_ib_sg_dma_address
-root	rdsv3_ib_stats_info_copy
-root	rdsv3_ib_sync_mr
-root	rdsv3_ib_sysctl_exit
-root	rdsv3_ib_sysctl_init
-root	rdsv3_ib_tune_rnr
-root	rdsv3_ib_update_ipaddr
-root	rdsv3_ib_xmit
-root	rdsv3_ib_xmit_complete
-root	rdsv3_ib_xmit_populate_wr
-root	rdsv3_ib_xmit_rdma
-root	rdsv3_if_lookup_by_addr
-root	rdsv3_if_lookup_by_name
-root	rdsv3_inc_addref
-root	rdsv3_inc_info_copy
-root	rdsv3_inc_init
-root	rdsv3_inc_put
-root	rdsv3_info
-root	rdsv3_info_deregister_func
-root	rdsv3_info_getsockopt
-root	rdsv3_info_register_func
-root	rdsv3_init
-root	rdsv3_ioctl
-root	rdsv3_logging_destroy
-root	rdsv3_logging_initialization
-root	rdsv3_loop_conn_alloc
-root	rdsv3_loop_conn_connect
-root	rdsv3_loop_conn_free
-root	rdsv3_loop_conn_shutdown
-root	rdsv3_loop_exit
-root	rdsv3_loop_init
-root	rdsv3_loop_recv
-root	rdsv3_loop_xmit
-root	rdsv3_loop_xmit_cong_map
-root	rdsv3_message_add_extension
-root	rdsv3_message_add_rdma_dest_extension
-root	rdsv3_message_add_version_extension
-root	rdsv3_message_addref
-root	rdsv3_message_alloc
-root	rdsv3_message_copy_from_user
-root	rdsv3_message_get_version_extension
-root	rdsv3_message_inc_copy_to_user
-root	rdsv3_message_inc_free
-root	rdsv3_message_inc_purge
-root	rdsv3_message_map_pages
-root	rdsv3_message_next_extension
-root	rdsv3_message_populate_header
-root	rdsv3_message_purge
-root	rdsv3_message_put
-root	rdsv3_message_unmapped
-root	rdsv3_message_wait
-root	rdsv3_mr_compare
-root	rdsv3_mr_put
-root	rdsv3_mr_tree_walk
-root	rdsv3_next_incoming
-root	rdsv3_notify_cong
-root	rdsv3_notify_queue_get
-root	rdsv3_ntop
-root	rdsv3_page_remainder_alloc
-root	rdsv3_pages_in_vec
-root	rds_path_down
-root	rds_path_up
-root	rdsv3_poll
-root	rdsv3_poll_wait
-root	rdsv3_put_cmsg
-root	rdsv3_queue_delayed_work
-root	rdsv3_queue_reconnect
-root	rdsv3_queue_work
-root	rdsv3_rdma_cm_event_handler
-root	rdsv3_rdma_drop_keys
-root	rdsv3_rdma_exit
-root	rdsv3_rdma_free_op
-root	rdsv3_rdma_init
-root	rdsv3_rdma_listen_init
-root	rdsv3_rdma_listen_stop
-root	rdsv3_rdma_prepare
-root	rdsv3_rdma_send_complete
-root	rdsv3_rdma_unuse
-root	rdsv3_recv_incoming
-root	rdsv3_recv_incoming_exthdrs
-root	rdsv3_recv_rcvbuf_delta
-root	rdsv3_recv_uio
-root	rdsv3_recv_worker
-root	rdsv3_recvmsg
-root	rdsv3_release
-root	rdsv3_remove_bound
-root	rds_sc_path_lookup
-root	rdsv3_scaddr_to_ibaddr
-root	rdsv3_send_acked_before
-root	rdsv3_send_drop_acked
-root	rdsv3_send_drop_to
-root	rdsv3_send_get_message
-root	rdsv3_send_is_acked
-root	rdsv3_send_pong
-root	rdsv3_send_queue_rm
-root	rdsv3_send_remove_from_sock
-root	rdsv3_send_reset
-root	rdsv3_send_sndbuf_remove
-root	rdsv3_send_uio
-root	rdsv3_send_worker
-root	rdsv3_send_xmit
-root	rdsv3_sendmsg
-root	rdsv3_set_bool_option
-root	rdsv3_setsockopt
-root	rdsv3_shutdown
-root	rdsv3_shutdown_worker
-root	rdsv3_sk_alloc
-root	rdsv3_sock_addref
-root	rdsv3_sock_exit
-root	rdsv3_sock_exit_data
-root	rdsv3_sock_inc_info
-root	rdsv3_sock_info
-root	rdsv3_sock_init
-root	rdsv3_sock_init_data
-root	rdsv3_sock_put
-root	rdsv3_stats_exit
-root	rdsv3_stats_info
-root	rdsv3_stats_info_copy
-root	rdsv3_stats_init
-root	rdsv3_still_queued
-root	rdsv3_sysctl_exit
-root	rdsv3_sysctl_init
-root	rdsv3_threads_exit
-root	rdsv3_threads_init
-root	rdsv3_trace
-root	rdsv3_trans_exit
-root	rdsv3_trans_get_preferred
-root	rdsv3_trans_init
-root	rdsv3_trans_register
-root	rdsv3_trans_stats_info_copy
-root	rdsv3_trans_unregister
-root	rdsv3_umem_cb
-root	rdsv3_verify_bind_address
-root	rdsv3_vlog
-root	rdsv3_vprintk
-root	rdsv3_wake_sk_sleep
-root	rdsv3_work_timeout_handler
-root	rdsv3_worker_thread
-root	rdsv3_create
-root	rdsv3_isloopback
-
-add	bus_ops::bus_add_eventcall		targets warlock_dummy
-add	bus_ops::bus_config			targets warlock_dummy
-add	bus_ops::bus_get_eventcookie		targets warlock_dummy
-add	bus_ops::bus_intr_ctl			targets warlock_dummy
-add	bus_ops::bus_post_event			targets warlock_dummy
-add	bus_ops::bus_remove_eventcall		targets warlock_dummy
-add	bus_ops::bus_unconfig			targets warlock_dummy
-
-
diff --git a/usr/src/uts/common/io/warlock/sbp2.wlcmd b/usr/src/uts/common/io/warlock/sbp2.wlcmd
deleted file mode 100644
index e4b25bdf46..0000000000
--- a/usr/src/uts/common/io/warlock/sbp2.wlcmd
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-root	sbp2_tgt_init
-root	sbp2_tgt_fini
-root	sbp2_tgt_disconnect
-root	sbp2_tgt_reconnect
-root	sbp2_tgt_reset
-root	sbp2_tgt_get_cfgrom
-root	sbp2_tgt_get_lun_cnt
-root	sbp2_tgt_get_lun
-
-root	sbp2_lun_reset
-root	sbp2_lun_login
-root	sbp2_lun_logout
-
-root	sbp2_ses_reconnect
-root	sbp2_ses_submit_task
-root	sbp2_ses_nudge
-root	sbp2_ses_remove_task
-root	sbp2_ses_find_task_state
-root	sbp2_ses_remove_first_task
-root	sbp2_ses_remove_first_task_state
-root	sbp2_ses_cancel_first_task
-root	sbp2_ses_agent_reset
-root	sbp2_ses_abort_task
-root	sbp2_ses_abort_task_set
-
-root	sbp2_task_orb_alloc
-root	sbp2_task_orb_free
-root	sbp2_task_orb_kaddr
-root	sbp2_task_orb_sync
-
-root	sbp2_mgt_status_fifo_wb_cb
-root	sbp2_status_fifo_wb_cb
-
-add	sbp2_bus::sb_alloc_buf targets warlock_dummy
-add	sbp2_bus::sb_alloc_cmd targets warlock_dummy
-add	sbp2_bus::sb_buf_wr_done targets warlock_dummy
-add	sbp2_bus::sb_free_buf targets warlock_dummy
-add	sbp2_bus::sb_free_cmd targets warlock_dummy
-add	sbp2_bus::sb_get_iblock_cookie targets warlock_dummy
-add	sbp2_bus::sb_rq targets warlock_dummy
-add	sbp2_bus::sb_sync_buf targets warlock_dummy
-add	sbp2_bus::sb_wb targets warlock_dummy
-add	sbp2_bus::sb_wq targets warlock_dummy
-add	sbp2_ses::s_status_cb targets warlock_dummy
-
-add     bus_ops::bus_config targets warlock_dummy
-add     bus_ops::bus_unconfig targets warlock_dummy
-add	bus_ops::bus_add_eventcall targets warlock_dummy
-add	bus_ops::bus_get_eventcookie targets warlock_dummy
-add	bus_ops::bus_intr_ctl targets warlock_dummy
-add	bus_ops::bus_post_event targets warlock_dummy
-add	bus_ops::bus_remove_eventcall targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/scmi2c.wlcmd b/usr/src/uts/common/io/warlock/scmi2c.wlcmd
deleted file mode 100644
index c242aa2e3b..0000000000
--- a/usr/src/uts/common/io/warlock/scmi2c.wlcmd
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-### specify the root functions
-
-add	bus_ops::bus_add_eventcall targets warlock_dummy
-add	bus_ops::bus_get_eventcookie targets warlock_dummy
-add	bus_ops::bus_post_event targets warlock_dummy
-add	bus_ops::bus_remove_eventcall targets warlock_dummy
-add	bus_ops::bus_intr_ctl targets warlock_dummy
-add     bus_ops::bus_config targets warlock_dummy
-add     bus_ops::bus_unconfig targets warlock_dummy
-
-root    scmi2c.c:scm_amber_led_on
-root    scmi2c.c:stcplus_init_uart
-
diff --git a/usr/src/uts/common/io/warlock/scsa1394.wlcmd b/usr/src/uts/common/io/warlock/scsa1394.wlcmd
deleted file mode 100644
index ef1bd2ea3b..0000000000
--- a/usr/src/uts/common/io/warlock/scsa1394.wlcmd
+++ /dev/null
@@ -1,159 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-one	scsa1394_state
-one 	scsi_device
-one     __ddi_xbuf_attr
-one     sd_lun
-one     sd_resv_reclaim_request
-
-root	scsa1394_scsi_tgt_init
-root	scsa1394_scsi_tgt_free
-root	scsa1394_scsi_tgt_probe
-root	scsa1394_probe_tran
-root	scsa1394_scsi_init_pkt
-root	scsa1394_scsi_destroy_pkt
-root	scsa1394_scsi_start
-root	scsa1394_scsi_abort
-root	scsa1394_scsi_reset
-root	scsa1394_scsi_getcap
-root	scsa1394_scsi_setcap
-root	scsa1394_scsi_dmafree
-root	scsa1394_scsi_sync_pkt
-root	scsa1394_scsi_bus_config
-root	scsa1394_scsi_bus_unconfig
-root	scsa1394_bus_reset
-root	scsa1394_disconnect
-root	scsa1394_reconnect
-
-root	scsa1394_cmd_cache_constructor
-root	scsa1394_cmd_cache_destructor
-
-root	scsa1394_sbp2_conv_status
-root	scsa1394_sbp2_req_bus_reset
-root	scsa1394_sbp2_req_reconnect
-root	scsa1394_sbp2_req_status
-root	scsa1394_sbp2_status_cb
-root	scsa1394_sbp2_status_proc
-root	scsa1394_sbp2_worker_thread
-
-root	scsa1394_bus_get_iblock_cookie
-root	scsa1394_bus_get_node_id
-root	scsa1394_bus_alloc_cmd
-root	scsa1394_bus_free_cmd
-root	scsa1394_bus_rq
-root	scsa1394_bus_rb
-root	scsa1394_bus_wq
-root	scsa1394_bus_wb
-root	scsa1394_bus_alloc_buf
-root	scsa1394_bus_alloc_buf_phys
-root	scsa1394_bus_free_buf_phys
-root	scsa1394_bus_alloc_buf_normal
-root	scsa1394_bus_free_buf_normal
-root	scsa1394_bus_free_buf
-root	scsa1394_bus_sync_buf
-root	scsa1394_bus_buf_rw_done
-root	scsa1394_bus_recv_read_request
-root	scsa1394_bus_recv_write_request
-
-add	scsi_hba_tran::tran_bus_config targets warlock_dummy
-add	scsi_hba_tran::tran_bus_unconfig targets warlock_dummy
-add     scsi_hba_tran::tran_bus_power targets warlock_dummy
-
-root	sbp2_cfgrom_ent_by_key_walker
-
-add	scsi_pkt::pkt_comp targets \
-	scsa1394_scsi_destroy_pkt \
-	scsa1394_scsi_init_pkt \
-	scsa1394_scsi_start \
-	scsa1394_scsi_abort \
-	scsa1394_scsi_reset \
-	scsa1394_scsi_setcap \
-	scsa1394_scsi_getcap
-
-add     bus_ops::bus_config targets warlock_dummy
-add     bus_ops::bus_unconfig targets warlock_dummy
-add	bus_ops::bus_add_eventcall targets warlock_dummy
-add	bus_ops::bus_get_eventcookie targets warlock_dummy
-add	bus_ops::bus_intr_ctl targets warlock_dummy
-add	bus_ops::bus_post_event targets warlock_dummy
-add	bus_ops::bus_remove_eventcall targets warlock_dummy
-
-add	sbp2_bus_buf::bb_rb_cb targets warlock_dummy
-add	sbp2_bus_buf::bb_rq_cb targets warlock_dummy
-add	sbp2_bus_buf::bb_wb_cb targets warlock_dummy
-add	sbp2_bus_buf::bb_wq_cb targets warlock_dummy
-
-add	sbp2_bus::sb_alloc_buf targets scsa1394_bus_alloc_buf
-add	sbp2_bus::sb_alloc_cmd targets scsa1394_bus_alloc_cmd
-add	sbp2_bus::sb_buf_wr_done targets scsa1394_bus_buf_rw_done
-add	sbp2_bus::sb_free_buf targets scsa1394_bus_free_buf
-add	sbp2_bus::sb_free_cmd targets scsa1394_bus_free_cmd
-add	sbp2_bus::sb_get_iblock_cookie targets scsa1394_bus_get_iblock_cookie
-add	sbp2_bus::sb_rq targets scsa1394_bus_rq
-add	sbp2_bus::sb_sync_buf targets scsa1394_bus_sync_buf
-add	sbp2_bus::sb_wb targets scsa1394_bus_wb
-add	sbp2_bus::sb_wq targets scsa1394_bus_wq
-add	sbp2_ses::s_status_cb targets scsa1394_sbp2_status_cb
-
-ignore  sd.c:sd_scsi_probe_cache_fini
-ignore  sd.c:sd_scsi_probe_cache_init
-ignore	sd.c:sd_scsi_target_lun_fini
-ignore	sd.c:sd_scsi_target_lun_init
-root    sd.c:sd_taskq_create
-root    sd.c:sd_taskq_delete
-
-add scsi_watch_request::swr_callback targets \
-        sd.c:sd_mhd_watch_cb \
-        sd.c:sd_media_watch_cb
-
-add scsi_pkt::pkt_comp targets \
-        sd.c:sd_mhd_watch_cb \
-        sd.c:sd_media_watch_cb \
-        sd.c:sd_mhd_watch_cb \
-        sd.c:sdintr \
-        hba.c:scsa1394_scsi_init_pkt \
-        hba.c:scsa1394_scsi_start \
-        hba.c:scsa1394_scsi_abort \
-        hba.c:scsa1394_scsi_reset \
-        hba.c:scsa1394_scsi_setcap \
-        hba.c:scsa1394_scsi_getcap \
-        hba.c:scsa1394_scsi_tgt_init \
-        hba.c:scsa1394_scsi_tgt_free
-
-add     sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-
-root    sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root    sd_wm_cache_constructor sd_wm_cache_destructor sd_read_modify_write_task
-root    sd_failfast_flushq_callback sd_reenable_dsense_task
-root	sd_target_change_task
-
-root    scsi_hba.c:scsi_hba_bus_power
-root    sd.c:sd_mhd_reset_notify_cb
-
-add     __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-add     sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-add     dk_callback::dkc_callback targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/scsa2usb.wlcmd b/usr/src/uts/common/io/warlock/scsa2usb.wlcmd
deleted file mode 100644
index 96ff440e22..0000000000
--- a/usr/src/uts/common/io/warlock/scsa2usb.wlcmd
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-
-one scsa2usb_state
-
-root	scsa2usb_scsi_tgt_init scsa2usb_scsi_tgt_probe scsa2usb_scsi_tgt_free
-root	scsa2usb_scsi_start scsa2usb_scsi_abort scsa2usb_scsi_reset
-root	scsa2usb_scsi_getcap scsa2usb_scsi_setcap scsa2usb_scsi_init_pkt
-root	scsa2usb_scsi_destroy_pkt
-root	scsa2usb_reconnect_event_cb
-root	scsa2usb_disconnect_event_cb
-root	scsa2usb_panic_callb
-root	scsa2usb_work_thread
-
-root	scsi_hba_bus_power
-
-add	scsi_hba_tran::tran_bus_config targets warlock_dummy
-add	scsi_hba_tran::tran_bus_unconfig targets warlock_dummy
-add	scsi_hba_tran::tran_bus_power targets warlock_dummy
-
-add scsi_pkt::pkt_comp targets \
-        scsa2usb_scsi_destroy_pkt \
-        scsa2usb_scsi_init_pkt \
-        scsa2usb_scsi_start \
-        scsa2usb_scsi_abort \
-        scsa2usb_scsi_reset \
-        scsa2usb_scsi_setcap \
-        scsa2usb_scsi_getcap 
diff --git a/usr/src/uts/common/io/warlock/scsa2usb_with_usba.wlcmd b/usr/src/uts/common/io/warlock/scsa2usb_with_usba.wlcmd
deleted file mode 100644
index afc7645d37..0000000000
--- a/usr/src/uts/common/io/warlock/scsa2usb_with_usba.wlcmd
+++ /dev/null
@@ -1,248 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-one	ohci_state
-one	ehci_state
-one	uhci_state
-one	scsa2usb_state
-one	scsi_device
-one     __ddi_xbuf_attr
-one     sd_lun
-one     sd_resv_reclaim_request
-
-### specify the root functions
-
-root	usba_ascii_string_descr
-root	usb_console_output_init
-root	usb_console_output_fini
-root	usb_console_output_enter
-root	usb_console_output_exit
-root	usb_console_write
-root	usb_console_input_enter
-root	usb_console_input_exit
-root	usb_console_input_fini
-root	usb_console_input_init
-root	usb_console_read
-root	usb_get_dev_descr
-root	usb_get_if_number
-root	usb_parse_CV_cfg_descr
-root	usb_parse_CV_ep_descr
-root	usb_parse_CV_if_descr
-root	usb_parse_comp_ep_descr
-root	usb_pipe_get_private
-root	usb_get_current_frame_number
-root	usb_get_max_isoc_pkts
-root	usba_pipe_get_policy
-root	usb_pipe_set_private
-root	usba_ready_interface_node
-root	usba_free_hcdi_ops
-root	usba_async_req_raise_power
-root	usba_async_req_lower_power
-root    usb_rval2errno
-root	usb_req_raise_power
-root	usb_req_lower_power
-root	usb_set_device_pwrlvl0
-root	usb_set_device_pwrlvl1
-root	usb_set_device_pwrlvl2
-root	usb_set_device_pwrlvl3
-root	usb_is_pm_enabled
-root	usb_async_req
-root	usb_pipe_bulk_transfer_size
-root	usb_ep_num
-root	usb_get_ep_data
-root	usb_pipe_ctrl_xfer_wait
-root	usb_pipe_drain_reqs
-root	usb_try_serialize_access
-
-root	usb_fini_serialization
-root	usb_init_serialization
-root	usb_release_access
-root	usb_serialize_access
-
-root    usb_alloc_bulk_req
-root    usb_clear_feature
-root    usb_free_bulk_req
-root    usb_get_alt_if
-root    usb_get_ep_descr
-root    usb_get_if_descr
-root    usb_pipe_bulk_xfer
-root    usb_pipe_isoc_xfer
-root    usb_pipe_stop_isoc_polling
-root    usb_set_alt_if
-root    usb_set_cfg
-root    usb_get_cfg
-root	usb_get_status
-root    usb_log_descr_tree
-root    usb_print_descr_tree
-root	usb_register_hotplug_cbs
-root	usb_get_current_cfgidx
-root	usb_register_client
-root	usb_ugen_power
-root	usb_reset_device
-root	usb_register_dev_driver
-root	usb_unregister_dev_driver
-
-root	usba_common_power
-root	usba_common_register_events
-root	usba_ready_interface_association_node
-root    usba_get_hc_dma_attr
-root    usba_hcdi_get_req_private
-root    usba_hcdi_set_req_private
-root	usba_pipe_do_async_func_thread
-root	hcdi_autoclearing
-root	hcdi_cb_thread
-root    hcdi_shared_cb_thread
-
-
-root	hubd_cpr_post_user_callb
-root	hubd_hotplug_thread
-root	hubd_reset_thread
-root    hubd_disconnect_event_cb
-root    hubd_post_resume_event_cb
-root    hubd_pre_suspend_event_cb
-root    hubd_reconnect_event_cb
-root	hubd_root_hub_cleanup_thread
-
-root	ohci_intr
-root	ehci_intr
-root    ohci_quiesce
-root    uhci_quiesce
-root    ehci_quiesce
-
-root    usba_dbuf_tail
-root	usb_log
-root	hubd_restore_state_cb
-root	hubd_disconnect_event_cb
-root	hubd_bus_power
-root	usba_hubdi_power
-root	usba_hubdi_root_hub_power
-root	usba_get_hotplug_stats
-root	usba_reset_hotplug_stats
-root	usba_taskq_destroy
-root	usba_mk_mctl
-root	usb_fail_checkpoint
-
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_close
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_reset
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usb_isoc_req::isoc_cb		targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb		targets warlock_dummy
-add usba_pipe_async_req::callback	targets warlock_dummy
-add usba_pm_req::cb			targets warlock_dummy
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-
-add scsi_pkt::pkt_comp targets \
-        scsa2usb_scsi_destroy_pkt \
-        scsa2usb_scsi_init_pkt \
-        scsa2usb_scsi_start \
-        scsa2usb_scsi_abort \
-        scsa2usb_scsi_reset \
-        scsa2usb_scsi_setcap \
-        scsa2usb_scsi_getcap 
-
-root	scsa2usb_scsi_tgt_init scsa2usb_scsi_tgt_probe scsa2usb_scsi_tgt_free
-
-root	scsa2usb_reconnect_event_cb
-root	scsa2usb_disconnect_event_cb
-root	scsa2usb_work_thread
-root	scsa2usb_panic_callb
-
-add	scsi_hba_tran::tran_tgt_init	targets scsa2usb_scsi_tgt_init
-add	scsi_hba_tran::tran_tgt_probe	targets scsa2usb_scsi_tgt_probe
-add	scsi_hba_tran::tran_tgt_free	targets scsa2usb_scsi_tgt_free
-add	scsi_hba_tran::tran_start	targets scsa2usb_scsi_start
-add	scsi_hba_tran::tran_abort	targets scsa2usb_scsi_abort
-add	scsi_hba_tran::tran_reset	targets scsa2usb_scsi_reset
-add	scsi_hba_tran::tran_getcap 	targets scsa2usb_scsi_getcap
-add	scsi_hba_tran::tran_setcap 	targets scsa2usb_scsi_setcap
-add	scsi_hba_tran::tran_init_pkt 	targets scsa2usb_scsi_init_pkt
-add	scsi_hba_tran::tran_destroy_pkt	targets scsa2usb_scsi_destroy_pkt
-add	scsi_hba_tran::tran_bus_config targets scsa2usb_scsi_bus_config
-add	scsi_hba_tran::tran_bus_unconfig targets scsa2usb_scsi_bus_unconfig
-
-add	scsi_hba_tran::tran_bus_power targets warlock_dummy
-
-ignore  sd.c:sd_scsi_probe_cache_fini
-ignore  sd.c:sd_scsi_probe_cache_init
-ignore	sd.c:sd_scsi_target_lun_fini
-ignore	sd.c:sd_scsi_target_lun_init
-root    sd.c:sd_taskq_create
-root    sd.c:sd_taskq_delete 
-
-
-add scsi_watch_request::swr_callback targets \
-        sd.c:sd_mhd_watch_cb \
-        sd.c:sd_media_watch_cb
-
-add scsi_pkt::pkt_comp targets \
-        sd.c:sd_mhd_watch_cb \
-        sd.c:sd_media_watch_cb \
-        sd.c:sd_mhd_watch_cb \
-        scsi_watch.c:scsi_watch_request_intr \
-        sd.c:sdintr \
-        scsa2usb.c:scsa2usb_scsi_init_pkt \
-        scsa2usb.c:scsa2usb_scsi_start \
-        scsa2usb.c:scsa2usb_scsi_abort \
-        scsa2usb.c:scsa2usb_scsi_reset \
-        scsa2usb.c:scsa2usb_scsi_setcap \
-        scsa2usb.c:scsa2usb_scsi_getcap \
-        scsa2usb.c:scsa2usb_scsi_tgt_init \
-        scsa2usb.c:scsa2usb_scsi_tgt_free 
-
-add	sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-
-root	sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root	sd_wm_cache_constructor sd_wm_cache_destructor sd_read_modify_write_task
-root	sd_failfast_flushq_callback sd_reenable_dsense_task
-root	sd_target_change_task
-
-root	scsi_hba.c:scsi_hba_bus_power
-root	sd.c:sd_mhd_reset_notify_cb
-
-add     __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-add st.c:st_known_tape_type/config_funct targets \
-        st_get_conf_from_st_dot_conf \
-        st_get_conf_from_st_conf_dot_c \
-	st_get_conf_from_tape_drive \
-        st_get_default_conf
-
-
-add scsi_watch_request::swr_callback targets \
-        st.c:st_media_watch_cb
-
-add     sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-add     dk_callback::dkc_callback targets warlock_dummy
-
-root	st_bigblk_xfer_done
diff --git a/usr/src/uts/common/io/warlock/scsi.c b/usr/src/uts/common/io/warlock/scsi.c
deleted file mode 100644
index 845e2f28ea..0000000000
--- a/usr/src/uts/common/io/warlock/scsi.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/*
- * scsi.c - Warlock versions of DDI/DKI routines associated with scsi
- *
- * These renditions of the scsi-related DDI/DKI routines give warlock
- * info about control flow which warlock needs in order to do a good
- * job of analysis.
- */
-#include <sys/note.h>
-#include <sys/scsi/scsi.h>
-#include <sys/ddi.h>
-#include <sys/sunddi.h>
-#include <sys/scsi/impl/transport.h>
-
-void
-scsi_init()
-{
-	struct scsi_hba_tran *p;
-
-	p->tran_tgt_init(0, 0, 0, 0);
-	p->tran_tgt_probe(0, 0);
-	p->tran_tgt_free(0, 0, 0, 0);
-	p->tran_add_eventcall(0, 0, 0, 0, 0, 0);
-	p->tran_get_eventcookie(0, 0, 0, 0);
-	p->tran_post_event(0, 0, 0, 0);
-	p->tran_remove_eventcall(0, 0);
-}
diff --git a/usr/src/uts/common/io/warlock/sd.wlcmd b/usr/src/uts/common/io/warlock/sd.wlcmd
deleted file mode 100644
index 24073b8ce7..0000000000
--- a/usr/src/uts/common/io/warlock/sd.wlcmd
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-one	scsi_device
-one	__ddi_xbuf_attr
-one	sd_lun
-one	sd_resv_reclaim_request
-
-root sd_mhd_reset_notify_cb
-
-root sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root sd_wm_cache_constructor sd_wm_cache_destructor sd_read_modify_write_task
-root sd_failfast_flushq_callback sd_reenable_dsense_task
-root sd_start_direct_priority_command
-root sd_target_change_task
-root xbuf_brk_done
-
-### Give warlock a dummy target for each of the function
-### pointers in the scsi_hba_tran structure.
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-	add $ptr target warlock_dummy
-done
-root	scsi_hba_bus_power
-root	scsi_hba_fm_init_child
-root	sdrunout
-
-add scsi_watch_request::swr_callback targets sd_media_watch_cb sd_mhd_watch_cb
-add sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-
-add 	__ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-add	sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-add	dk_callback::dkc_callback targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/sd_with_esp.wlcmd b/usr/src/uts/common/io/warlock/sd_with_esp.wlcmd
deleted file mode 100644
index a7da6e100f..0000000000
--- a/usr/src/uts/common/io/warlock/sd_with_esp.wlcmd
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-add scsi_watch_request::swr_callback targets \
-	sd.c:sd_mhd_watch_cb \
-	sd.c:sd_media_watch_cb
-
-add esp_cmd::cmd_pkt.pkt_comp targets \
-	sd.c:sd_mhd_watch_cb \
-	sd.c:sd_media_watch_cb \
-	sd.c:sd_mhd_watch_cb \
-	scsi_watch.c:scsi_watch_request_intr \
-	sd.c:sdintr
-
-add     __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-one	scsi_device
-one	esp
-one     __ddi_xbuf_attr
-one     sd_lun
-one     sd_resv_reclaim_request
-
-
-root 	esp_kmem_cache_constructor esp_kmem_cache_destructor
-
-root 	sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root 	sd_wm_cache_constructor sd_wm_cache_destructor
-root 	sd_read_modify_write_task sd_reenable_dsense_task
-root 	sd_failfast_flushq_callback
-root	sd_target_change_task
-
-add notify_entry::callback target  sd_mhd_reset_notify_cb
-add sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-
-root  	esp.c:esp_scsi_dmafree esp.c:esp_scsi_sync_pkt
-
-assert 	order scsi_device::sd_mutex  esp::e_mutex
-
-disallow esp_call_pkt_comp sd_mhd_watch_cb
-disallow esp_call_pkt_comp scsi_watch_request_intr
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-root    scsi_hba_bus_power
-ignore	delay
-add     sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-add     dk_callback::dkc_callback targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/sd_with_fas.wlcmd b/usr/src/uts/common/io/warlock/sd_with_fas.wlcmd
deleted file mode 100644
index 6086171fc0..0000000000
--- a/usr/src/uts/common/io/warlock/sd_with_fas.wlcmd
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-add scsi_watch_request::swr_callback targets \
-	sd.c:sd_mhd_watch_cb \
-	sd.c:sd_media_watch_cb
-
-add     __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-add scsi_pkt::pkt_comp targets \
-	sd.c:sd_mhd_watch_cb \
-	sd.c:sd_media_watch_cb \
-	sd.c:sd_mhd_watch_cb \
-	scsi_watch.c:scsi_watch_request_intr \
-	sd.c:sdintr \
-	fas.c:fas_scsi_destroy_pkt \
-	fas.c:fas_scsi_init_pkt \
-	fas.c:fas_scsi_start \
-	fas.c:fas_scsi_abort \
-	fas.c:fas_scsi_reset \
-	fas.c:fas_scsi_setcap \
-	fas.c:fas_scsi_getcap \
-	fas.c:fas_scsi_dmafree \
-	fas.c:fas_scsi_reset_notify \
-	fas.c:fas_scsi_sync_pkt
-
-one 	scsi_device
-one 	fas
-one     __ddi_xbuf_attr
-one     sd_lun
-one     sd_resv_reclaim_request
-
-
-add 	notify_entry::callback target  sd_mhd_reset_notify_cb
-add sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-
-assert order scsi_device::sd_mutex  fas::f_mutex
-root fas_kmem_cache_constructor fas_kmem_cache_destructor
-
-root sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root sd_wm_cache_constructor sd_wm_cache_destructor sd_read_modify_write_task
-root sd_failfast_flushq_callback sd_reenable_dsense_task
-root sd_target_change_task
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-root    scsi_hba_bus_power
-ignore	delay
-
-add     sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-add     dk_callback::dkc_callback targets warlock_dummy
-
diff --git a/usr/src/uts/common/io/warlock/sd_with_glm.wlcmd b/usr/src/uts/common/io/warlock/sd_with_glm.wlcmd
deleted file mode 100644
index 35ce38d004..0000000000
--- a/usr/src/uts/common/io/warlock/sd_with_glm.wlcmd
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# 
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-add scsi_watch_request::swr_callback targets \
-	sd.c:sd_mhd_watch_cb \
-	sd.c:sd_media_watch_cb
-
-add     __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-add scsi_pkt::pkt_comp targets \
-	sd.c:sd_mhd_watch_cb \
-	sd.c:sd_media_watch_cb \
-	sd.c:sd_mhd_watch_cb \
-	scsi_watch.c:scsi_watch_request_intr \
-	sd.c:sdintr \
-	glm.c:glm_scsi_destroy_pkt \
-	glm.c:glm_scsi_init_pkt \
-	glm.c:glm_scsi_start \
-	glm.c:glm_scsi_abort \
-	glm.c:glm_scsi_reset \
-	glm.c:glm_scsi_setcap \
-	glm.c:glm_scsi_getcap \
-	glm.c:glm_scsi_dmafree \
-	glm.c:glm_scsi_reset_notify \
-	glm.c:glm_scsi_tgt_init \
-	glm.c:glm_scsi_tgt_free \
-	glm.c:glm_scsi_sync_pkt
-
-one 	scsi_device
-one 	glm
-one     __ddi_xbuf_attr
-one     sd_lun
-one     sd_resv_reclaim_request
-
-add 	notify_entry::callback target  sd_mhd_reset_notify_cb
-add 	sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-
-root 	glm_kmem_cache_constructor glm_kmem_cache_destructor
-
-root 	sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root 	sd_wm_cache_constructor sd_wm_cache_destructor sd_read_modify_write_task
-root 	sd_failfast_flushq_callback sd_reenable_dsense_task
-root	sd_target_change_task
-
-assert order scsi_device::sd_mutex  glm::g_mutex
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-root    scsi_hba_bus_power
-ignore  delay
-add     sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-add     dk_callback::dkc_callback targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/sd_with_isp.wlcmd b/usr/src/uts/common/io/warlock/sd_with_isp.wlcmd
deleted file mode 100644
index df5c7d3b82..0000000000
--- a/usr/src/uts/common/io/warlock/sd_with_isp.wlcmd
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-add scsi_watch_request::swr_callback targets \
-	sd.c:sd_mhd_watch_cb \
-	sd.c:sd_media_watch_cb
-
-add scsi_pkt::pkt_comp targets \
-	sd.c:sd_mhd_watch_cb \
-	sd.c:sd_media_watch_cb \
-	sd.c:sd_mhd_watch_cb \
-	scsi_watch.c:scsi_watch_request_intr \
-	sd.c:sdintr
-	
-add     __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-one 	scsi_device
-one 	isp
-one     __ddi_xbuf_attr
-one     sd_lun
-one     sd_resv_reclaim_request
-
-
-add notify_entry::callback target  sd_mhd_reset_notify_cb
-add sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-
-root isp_kmem_cache_constructor isp_kmem_cache_destructor
-root isp.c:isp_scsi_dmafree isp.c:isp_scsi_sync_pkt
-root isp.c:isp_i_print_response
-
-root sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root sd_wm_cache_constructor sd_wm_cache_destructor sd_read_modify_write_task
-root sd_failfast_flushq_callback sd_reenable_dsense_task
-root sd_target_change_task
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-root    scsi_hba_bus_power
-ignore  delay
-add     sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-add     dk_callback::dkc_callback targets warlock_dummy
-
diff --git a/usr/src/uts/common/io/warlock/sd_with_mpt.wlcmd b/usr/src/uts/common/io/warlock/sd_with_mpt.wlcmd
deleted file mode 100644
index ff639dace3..0000000000
--- a/usr/src/uts/common/io/warlock/sd_with_mpt.wlcmd
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-add scsi_watch_request::swr_callback targets \
-	sd.c:sd_mhd_watch_cb \
-	sd.c:sd_media_watch_cb
-
-add     __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-add scsi_pkt::pkt_comp targets \
-	sd.c:sd_mhd_watch_cb \
-	sd.c:sd_media_watch_cb \
-	sd.c:sd_mhd_watch_cb \
-	scsi_watch.c:scsi_watch_request_intr \
-	sd.c:sdintr \
-	mpt.c:mpt_scsi_destroy_pkt \
-	mpt.c:mpt_scsi_init_pkt \
-	mpt.c:mpt_scsi_start \
-	mpt.c:mpt_scsi_abort \
-	mpt.c:mpt_scsi_reset \
-	mpt.c:mpt_scsi_setcap \
-	mpt.c:mpt_scsi_getcap \
-	mpt.c:mpt_scsi_dmafree \
-	mpt.c:mpt_scsi_reset_notify \
-	mpt.c:mpt_scsi_tgt_init \
-	mpt.c:mpt_scsi_tgt_free \
-	mpt.c:mpt_scsi_sync_pkt \
-	mpt.c:mpt_smp_start \
-	mpt.c:mpt_sas_getcap
-
-one 	scsi_device
-one 	mpt
-one     __ddi_xbuf_attr
-one     sd_lun
-one     sd_resv_reclaim_request
-
-add 	notify_entry::callback target  sd_mhd_reset_notify_cb
-add 	sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-
-root 	mpt_kmem_cache_constructor mpt_kmem_cache_destructor
-root	mpt_handle_event
-root	mpt_handle_dr
-root	mpt_fm_error_cb
-
-root 	sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root 	sd_wm_cache_constructor sd_wm_cache_destructor sd_read_modify_write_task
-root 	sd_failfast_flushq_callback sd_reenable_dsense_task
-root	sd_target_change_task
-
-assert order scsi_device::sd_mutex  mpt::m_mutex
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-root    scsi_hba_bus_power
-ignore  delay
-add     sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-add     dk_callback::dkc_callback targets warlock_dummy
-
diff --git a/usr/src/uts/common/io/warlock/sd_with_uata.wlcmd b/usr/src/uts/common/io/warlock/sd_with_uata.wlcmd
deleted file mode 100644
index d49de3a1b9..0000000000
--- a/usr/src/uts/common/io/warlock/sd_with_uata.wlcmd
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-add scsi_watch_request::swr_callback targets \
-	sd.c:sd_mhd_watch_cb \
-	sd.c:sd_media_watch_cb
-	
-add     __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-add scsi_pkt::pkt_comp targets \
-	sd.c:sd_mhd_watch_cb \
-	sd.c:sd_media_watch_cb \
-	sd.c:sd_mhd_watch_cb \
-	scsi_watch.c:scsi_watch_request_intr \
-	sd.c:sdintr
-
-one 	scsi_device
-one 	ata_controller
-one     __ddi_xbuf_attr
-one     sd_lun
-one     sd_resv_reclaim_request
-
-
-### The following are not used
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-
-
-### Declaring the following as root functions
-root scsi_hba_add_eventcall scsi_hba_get_eventcookie scsi_hba_post_event
-root scsi_hba_remove_eventcall ata_bus_ctl ghd_timer_fini ghd_timer_init
-
-root sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root sd_wm_cache_constructor sd_wm_cache_destructor sd_read_modify_write_task
-root sd_failfast_flushq_callback sd_reenable_dsense_task
-root sd_target_change_task
-
-add sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-
-### These are the HBA entry points for atapi
-add scsi_hba_tran::tran_tgt_init target atapi_tran_tgt_init
-add scsi_hba_tran::tran_tgt_probe target atapi_tran_tgt_probe
-add scsi_hba_tran::tran_start  target atapi_tran_start
-add scsi_hba_tran::tran_abort target atapi_tran_abort
-add scsi_hba_tran::tran_init_pkt target atapi_tran_init_pkt
-add scsi_hba_tran::tran_destroy_pkt  target atapi_tran_destroy_pkt
-
-add ata_pkt::ap_start targets \
-        atapi_start \
-        ata_disk_start
-
-add ata_pkt::ap_intr targets \
-        atapi_intr \
-        ata_disk_intr
-
-add ata_pkt::ap_complete targets \
-        atapi_complete \
-        ata_disk_complete
-
-### Entry points for ghd
-
-add cmd_ctl::ccc_hba_start target ata_hba_start
-add cmd_ctl::ccc_hba_complete target ata_hba_complete
-add cmd_ctl::ccc_process_intr target ata_process_intr
-add cmd_ctl::ccc_get_status target ata_get_status
-add cmd_ctl::ccc_timeout_func target ata_timeout_func
-add processfunc target ata_process_intr
-add statfunc target ata_get_status
-
-
-### The following are commented as they would not be called
-
-add dcd_pkt::pkt_comp target warlock_dummy
-add cmd_ctl::ccc_ccballoc target warlock_dummy
-add cmd_ctl::ccc_ccbfree target warlock_dummy
-
-### Ignore the following functions as they are never used
-
-ignore L1_remove ata_disk_init_reset ghd_doneq_put ghd_gcmd_alloc
-ignore ghd_gcmd_free ghd_timer_stop ghd_tran_sync_pkt
-ignore scsi_htos_3byte scsi_htos_long scsi_htos_short scsi_stoh_3byte
-ignore scsi_stoh_long scsi_stoh_short sd_mhd_reset_notify_cb
-
-### The following functions need to be ignored for sd as they are never called
-### for atapi device. The uata hba caters to dad target driver also & the
-### the following are entry points for it
-ignore make_prd ata_disk_tran_abort ata_disk_tran_destroy_pkt
-ignore ata_disk_tran_init_pkt ata_disk_tran_reset ata_disk_tran_start
-ignore ata_disk_tran_tgt_init ata_disk_tran_tgt_probe
-
-### The following are atapi related but never invoked so ignore them too.
-
-ignore atapi_tran_dmafree atapi_tran_sync_pkt
-root 	atapi_signature
-root    scsi_hba_bus_power
-ignore  delay
-add     sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-add     dk_callback::dkc_callback targets warlock_dummy
-
-root ghd_pktfree ghd_pktalloc
diff --git a/usr/src/uts/common/io/warlock/ses.wlcmd b/usr/src/uts/common/io/warlock/ses.wlcmd
deleted file mode 100644
index fabfebbad4..0000000000
--- a/usr/src/uts/common/io/warlock/ses.wlcmd
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
- 
-one scsi_device 
-
-### Give warlock a dummy target for each of the function
-### pointers in the scsi_hba_tran structure.
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
- 
-
-root ses_runcmd
-
-add ses_softc::ses_vec.get_encstat target safte_get_encstat
-add ses_softc::ses_vec.get_objstat target safte_get_objstat
-add ses_softc::ses_vec.init_enc    target safte_init_enc
-add ses_softc::ses_vec.set_encstat target safte_set_encstat
-add ses_softc::ses_vec.set_objstat target safte_set_objstat
-add ses_softc::ses_vec.softc_init  target safte_softc_init
-
-add ses_softc::ses_vec.get_encstat target sen_get_encstat
-add ses_softc::ses_vec.get_objstat target sen_get_objstat
-add ses_softc::ses_vec.init_enc    target sen_init_enc
-add ses_softc::ses_vec.set_encstat target sen_set_encstat
-add ses_softc::ses_vec.set_objstat target sen_set_objstat
-add ses_softc::ses_vec.softc_init  target sen_softc_init
-
-add ses_softc::ses_vec.get_encstat target ses_get_encstat
-add ses_softc::ses_vec.get_objstat target ses_get_objstat
-add ses_softc::ses_vec.init_enc    target ses_init_enc
-add ses_softc::ses_vec.set_encstat target ses_set_encstat
-add ses_softc::ses_vec.set_objstat target ses_set_objstat
-add ses_softc::ses_vec.softc_init  target ses_softc_init
-
-root scsi_hba_bus_power
-
diff --git a/usr/src/uts/common/io/warlock/ses_with_esp.wlcmd b/usr/src/uts/common/io/warlock/ses_with_esp.wlcmd
deleted file mode 100644
index d3329a72a2..0000000000
--- a/usr/src/uts/common/io/warlock/ses_with_esp.wlcmd
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-one scsi_device
-one esp 
-
-add notify_entry::callback target warlock_dummy
-add esp_cmd::cmd_pkt.pkt_comp targets ses.c:ses_callback
-
-#assert order esp::e_mutex scsi_device::sd_mutex
-assert order scsi_device::sd_mutex  esp::e_mutex
-
-ignore esp_kmem_cache_constructor esp_kmem_cache_destructor
-ignore  esp.c:esp_scsi_dmafree esp.c:esp_scsi_sync_pkt
-ignore  esp.c:esp_abort esp.c:esp_scsi_reset_notify
-ignore  esp.c:esp_complete_arq_pkt esp.c:esp_call_pkt_comp
-
-root scsi_hba_reset_notify_setup
-
-
-root ses_runcmd
-
-add ses_softc::ses_vec.get_encstat target safte_get_encstat
-add ses_softc::ses_vec.get_objstat target safte_get_objstat
-add ses_softc::ses_vec.init_enc    target safte_init_enc
-add ses_softc::ses_vec.set_encstat target safte_set_encstat
-add ses_softc::ses_vec.set_objstat target safte_set_objstat
-add ses_softc::ses_vec.softc_init  target safte_softc_init
-
-add ses_softc::ses_vec.get_encstat target sen_get_encstat
-add ses_softc::ses_vec.get_objstat target sen_get_objstat
-add ses_softc::ses_vec.init_enc    target sen_init_enc
-add ses_softc::ses_vec.set_encstat target sen_set_encstat
-add ses_softc::ses_vec.set_objstat target sen_set_objstat
-add ses_softc::ses_vec.softc_init  target sen_softc_init
-
-add ses_softc::ses_vec.get_encstat target ses_get_encstat
-add ses_softc::ses_vec.get_objstat target ses_get_objstat
-add ses_softc::ses_vec.init_enc    target ses_init_enc
-add ses_softc::ses_vec.set_encstat target ses_set_encstat
-add ses_softc::ses_vec.set_objstat target ses_set_objstat
-add ses_softc::ses_vec.softc_init  target ses_softc_init
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-root    scsi_hba_bus_power
-ignore  delay
diff --git a/usr/src/uts/common/io/warlock/ses_with_fas.wlcmd b/usr/src/uts/common/io/warlock/ses_with_fas.wlcmd
deleted file mode 100644
index 245d8688a4..0000000000
--- a/usr/src/uts/common/io/warlock/ses_with_fas.wlcmd
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-one scsi_device
-one fas 
-
-assert order scsi_device::sd_mutex  fas::f_mutex
-
-add scsi_pkt::pkt_comp targets \
-	ses.c:ses_callback \
-	fas.c:fas_scsi_destroy_pkt \
-	fas.c:fas_scsi_init_pkt \
-	fas.c:fas_scsi_start \
-	fas.c:fas_scsi_abort \
-	fas.c:fas_scsi_reset \
-	fas.c:fas_scsi_setcap \
-	fas.c:fas_scsi_getcap \
-	fas.c:fas_scsi_dmafree \
-	fas.c:fas_scsi_reset_notify \
-	fas.c:fas_scsi_sync_pkt
-
-add notify_entry::callback target warlock_dummy
-
-ignore fas_kmem_cache_constructor fas_kmem_cache_destructor
-
-root scsi_hba_reset_notify_setup
-
-root ses_runcmd
-
-add ses_softc::ses_vec.get_encstat target safte_get_encstat
-add ses_softc::ses_vec.get_objstat target safte_get_objstat
-add ses_softc::ses_vec.init_enc    target safte_init_enc
-add ses_softc::ses_vec.set_encstat target safte_set_encstat
-add ses_softc::ses_vec.set_objstat target safte_set_objstat
-add ses_softc::ses_vec.softc_init  target safte_softc_init
-
-add ses_softc::ses_vec.get_encstat target sen_get_encstat
-add ses_softc::ses_vec.get_objstat target sen_get_objstat
-add ses_softc::ses_vec.init_enc    target sen_init_enc
-add ses_softc::ses_vec.set_encstat target sen_set_encstat
-add ses_softc::ses_vec.set_objstat target sen_set_objstat
-add ses_softc::ses_vec.softc_init  target sen_softc_init
-
-add ses_softc::ses_vec.get_encstat target ses_get_encstat
-add ses_softc::ses_vec.get_objstat target ses_get_objstat
-add ses_softc::ses_vec.init_enc    target ses_init_enc
-add ses_softc::ses_vec.set_encstat target ses_set_encstat
-add ses_softc::ses_vec.set_objstat target ses_set_objstat
-add ses_softc::ses_vec.softc_init  target ses_softc_init
-
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-root    scsi_hba_bus_power
-ignore  delay
diff --git a/usr/src/uts/common/io/warlock/ses_with_glm.wlcmd b/usr/src/uts/common/io/warlock/ses_with_glm.wlcmd
deleted file mode 100644
index 86e711e656..0000000000
--- a/usr/src/uts/common/io/warlock/ses_with_glm.wlcmd
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-one scsi_device
-one glm
-
-add scsi_pkt::pkt_comp targets ses.c:ses_callback
-add notify_entry::callback target warlock_dummy
-
-ignore glm_kmem_cache_constructor glm_kmem_cache_destructor
-ignore glm.c:glm_scsi_dmafree glm.c:glm_scsi_sync_pkt
-ignore glm.c:glm_scsi_reset_notify glm.c:glm_scsi_abort
-
-root glm_kmem_cache_constructor glm_kmem_cache_destructor
-root scsi_hba_reset_notify_setup
-
-
-root ses_runcmd
-
-add ses_softc::ses_vec.get_encstat target safte_get_encstat
-add ses_softc::ses_vec.get_objstat target safte_get_objstat
-add ses_softc::ses_vec.init_enc    target safte_init_enc
-add ses_softc::ses_vec.set_encstat target safte_set_encstat
-add ses_softc::ses_vec.set_objstat target safte_set_objstat
-add ses_softc::ses_vec.softc_init  target safte_softc_init
-
-add ses_softc::ses_vec.get_encstat target sen_get_encstat
-add ses_softc::ses_vec.get_objstat target sen_get_objstat
-add ses_softc::ses_vec.init_enc    target sen_init_enc
-add ses_softc::ses_vec.set_encstat target sen_set_encstat
-add ses_softc::ses_vec.set_objstat target sen_set_objstat
-add ses_softc::ses_vec.softc_init  target sen_softc_init
-
-add ses_softc::ses_vec.get_encstat target ses_get_encstat
-add ses_softc::ses_vec.get_objstat target ses_get_objstat
-add ses_softc::ses_vec.init_enc    target ses_init_enc
-add ses_softc::ses_vec.set_encstat target ses_set_encstat
-add ses_softc::ses_vec.set_objstat target ses_set_objstat
-add ses_softc::ses_vec.softc_init  target ses_softc_init
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-root    scsi_hba_bus_power
-ignore  delay
diff --git a/usr/src/uts/common/io/warlock/ses_with_isp.wlcmd b/usr/src/uts/common/io/warlock/ses_with_isp.wlcmd
deleted file mode 100644
index b97f2bd06a..0000000000
--- a/usr/src/uts/common/io/warlock/ses_with_isp.wlcmd
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-one scsi_device
-one isp 
-
-add scsi_pkt::pkt_comp targets ses.c:ses_callback
-add notify_entry::callback target warlock_dummy
-
-ignore isp_kmem_cache_constructor isp_kmem_cache_destructor
-ignore isp.c:isp_scsi_dmafree isp.c:isp_scsi_sync_pkt
-ignore isp.c:isp_scsi_reset_notify
-
-root scsi_hba_reset_notify_setup
-root isp.c:isp_i_print_response
-root ses_runcmd
-
-add ses_softc::ses_vec.get_encstat target safte_get_encstat
-add ses_softc::ses_vec.get_objstat target safte_get_objstat
-add ses_softc::ses_vec.init_enc    target safte_init_enc
-add ses_softc::ses_vec.set_encstat target safte_set_encstat
-add ses_softc::ses_vec.set_objstat target safte_set_objstat
-add ses_softc::ses_vec.softc_init  target safte_softc_init
-
-add ses_softc::ses_vec.get_encstat target sen_get_encstat
-add ses_softc::ses_vec.get_objstat target sen_get_objstat
-add ses_softc::ses_vec.init_enc    target sen_init_enc
-add ses_softc::ses_vec.set_encstat target sen_set_encstat
-add ses_softc::ses_vec.set_objstat target sen_set_objstat
-add ses_softc::ses_vec.softc_init  target sen_softc_init
-
-add ses_softc::ses_vec.get_encstat target ses_get_encstat
-add ses_softc::ses_vec.get_objstat target ses_get_objstat
-add ses_softc::ses_vec.init_enc    target ses_init_enc
-add ses_softc::ses_vec.set_encstat target ses_set_encstat
-add ses_softc::ses_vec.set_objstat target ses_set_objstat
-add ses_softc::ses_vec.softc_init  target ses_softc_init
-
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-root    scsi_hba_bus_power
-ignore  delay
diff --git a/usr/src/uts/common/io/warlock/si3124.wlcmd b/usr/src/uts/common/io/warlock/si3124.wlcmd
deleted file mode 100644
index a368db4802..0000000000
--- a/usr/src/uts/common/io/warlock/si3124.wlcmd
+++ /dev/null
@@ -1,120 +0,0 @@
-
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-one	si_ctl_state
-one     scsi_device
-one     __ddi_xbuf_attr
-one     sd_lun
-one     sd_resv_reclaim_request
-
-
-root    sata_hba_ioctl
-root    sata_hba_open
-root    sata_hba_close
-root    sata_scsi_reset
-root    sata_scsi_init_pkt
-root    sata_scsi_start
-root    sata_scsi_destroy_pkt
-root    sata_scsi_sync_pkt
-root    sata_scsi_tgt_init
-root    sata_scsi_tgt_free
-root    sata_scsi_tgt_probe
-root    sata_scsi_dmafree
-root    sata_scsi_abort
-root    sata_scsi_getcap
-root    sata_scsi_setcap
-
-add     sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-root    sd.c:sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root    sd.c:sd_wm_cache_constructor sd_wm_cache_destructor
-root	sd.c:sd_read_modify_write_task sd_reenable_dsense_task
-root	sd.c:sd_failfast_flushq_callback sd_start_direct_priority_command
-root	sd.c:sdstrategy sdioctl
-root	sd.c:sd_target_change_task
-
-root	scsi_hba.c:scsi_hba_bus_power
-
-ignore  sd.c:sd_scsi_probe_cache_fini
-ignore  sd.c:sd_scsi_probe_cache_init
-ignore	sd.c:sd_scsi_target_lun_fini
-ignore	sd.c:sd_scsi_target_lun_init
-root    sd.c:sd_taskq_create
-root    sd.c:sd_taskq_delete
-
-add     bus_ops::bus_add_eventcall		targets warlock_dummy
-add     bus_ops::bus_config			targets warlock_dummy
-add     bus_ops::bus_get_eventcookie		targets warlock_dummy
-add     bus_ops::bus_intr_ctl			targets warlock_dummy
-add     bus_ops::bus_post_event			targets warlock_dummy
-add     bus_ops::bus_remove_eventcall		targets warlock_dummy
-add     bus_ops::bus_unconfig			targets warlock_dummy
-
-add     scsi_hba_tran::tran_tgt_init    targets sata_scsi_tgt_init
-add     scsi_hba_tran::tran_tgt_probe   targets sata_scsi_tgt_probe
-add     scsi_hba_tran::tran_tgt_free    targets sata_scsi_tgt_free
-add     scsi_hba_tran::tran_start       targets sata_scsi_start
-add     scsi_hba_tran::tran_abort       targets sata_scsi_abort
-add     scsi_hba_tran::tran_reset       targets sata_scsi_reset
-add     scsi_hba_tran::tran_getcap      targets sata_scsi_getcap
-add     scsi_hba_tran::tran_setcap      targets sata_scsi_setcap
-add     scsi_hba_tran::tran_init_pkt    targets sata_scsi_init_pkt
-add     scsi_hba_tran::tran_destroy_pkt targets sata_scsi_destroy_pkt
-
-add     scsi_hba_tran::tran_add_eventcall       targets warlock_dummy
-add     scsi_hba_tran::tran_bus_config          targets warlock_dummy
-add     scsi_hba_tran::tran_bus_power           targets warlock_dummy
-add     scsi_hba_tran::tran_bus_unconfig        targets warlock_dummy
-add     scsi_hba_tran::tran_get_eventcookie     targets warlock_dummy
-add     scsi_hba_tran::tran_get_name            targets warlock_dummy
-add     scsi_hba_tran::tran_post_event          targets warlock_dummy
-add     scsi_hba_tran::tran_remove_eventcall    targets warlock_dummy
-root    scsi_hba.c:scsi_hba_bus_power
-
-add	dk_callback::dkc_callback		targets warlock_dummy
-add	sd_uscsi_info::ui_dkc.dkc_callback	targets warlock_dummy
- 
-add scsi_watch_request::swr_callback targets \
-        sd.c:sd_mhd_watch_cb \
-        sd.c:sd_media_watch_cb
-
-root si_fm_error_cb
-root si_quiesce
-
-add scsi_pkt::pkt_comp targets \
-	scsi_watch.c:scsi_watch_request_intr \
-	sd.c:sdintr \
-        sata_scsi_destroy_pkt \
-        sata_scsi_init_pkt \
-        sata_scsi_start \
-        sata_scsi_abort \
-        sata_scsi_reset \
-	sata_scsi_start
-
-add     __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-ignore	sd.c:sd_mhd_reset_notify_cb
-ignore	si_mop_commands
-
-assert order    si_ctl_state::sictl_mutex si_port_state::siport_mutex
diff --git a/usr/src/uts/common/io/warlock/ssd.wlcmd b/usr/src/uts/common/io/warlock/ssd.wlcmd
deleted file mode 100644
index 6952573b9f..0000000000
--- a/usr/src/uts/common/io/warlock/ssd.wlcmd
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-one scsi_device
-root ssd_mhd_reset_notify_cb ssd_event_callback
-root scsi_hba_post_event scsi_hba_remove_eventcall scsi_hba_add_eventcall scsi_hba_get_eventcookie
-
-root ssd_handle_mchange ssd_media_change_task ssd_start_stop_unit_task
-root ssd_wm_cache_constructor ssd_wm_cache_destructor ssd_read_modify_write_task
-root ssd_xbuf_strategy ssd_reenable_dsense_task
-root ssd_failfast_flushq_callback
-root ssd_start_direct_priority_command
-root ssd_target_change_task
-
-### Give warlock a dummy target for each of the function
-### pointers in the scsi_hba_tran structure.
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-	add $ptr target warlock_dummy
-done
-
-add scsi_watch_request::swr_callback targets ssd_media_watch_cb ssd_mhd_watch_cb
-add sd.c:ssd_start_cmds/funcp target ssd_initpkt_for_buf ssd_initpkt_for_uscsi
-
-root scsi_hba_bus_power
-
-add  sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-add  dk_callback::dkc_callback targets warlock_dummy
-
diff --git a/usr/src/uts/common/io/warlock/st.wlcmd b/usr/src/uts/common/io/warlock/st.wlcmd
deleted file mode 100644
index 051c0608ef..0000000000
--- a/usr/src/uts/common/io/warlock/st.wlcmd
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-one scsi_device 
-root scsi_hba_post_event scsi_hba_remove_eventcall scsi_hba_add_eventcall scsi_hba_get_eventcookie
-
-### Give warlock a dummy target for each of the function
-### pointers in the scsi_hba_tran structure.
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-	add $ptr target warlock_dummy
-done
-
-add scsi_watch_request::swr_callback targets st_media_watch_cb
-
-add st.c:st_known_tape_type/config_funct targets \
-        st_get_conf_from_st_dot_conf \
-        st_get_conf_from_st_conf_dot_c \
-	st_get_conf_from_tape_drive \
-        st_get_default_conf  
-
-root    scsi_hba_bus_power
-ignore  delay
-root	st_bigblk_xfer_done
diff --git a/usr/src/uts/common/io/warlock/st_with_esp.wlcmd b/usr/src/uts/common/io/warlock/st_with_esp.wlcmd
deleted file mode 100644
index 8826920ac6..0000000000
--- a/usr/src/uts/common/io/warlock/st_with_esp.wlcmd
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-add scsi_watch_request::swr_callback targets \
-	st.c:st_media_watch_cb
-
-add esp_cmd::cmd_pkt.pkt_comp targets \
-	st.c:st_media_watch_cb \
-	scsi_watch.c:scsi_watch_request_intr \
-	st.c:st_intr
-
-add st.c:st_known_tape_type/config_funct targets \
-	st_get_conf_from_st_dot_conf \
-	st_get_conf_from_st_conf_dot_c \
-	st_get_conf_from_tape_drive \
-	st_get_default_conf
-
-one scsi_device
-one esp 
-
-root 	esp_kmem_cache_constructor esp_kmem_cache_destructor
-root  	esp.c:esp_scsi_dmafree esp.c:esp_scsi_sync_pkt
-root  	esp.c:esp_abort esp.c:esp_scsi_reset_notify
-
-assert order scsi_device::sd_mutex  esp::e_mutex
-
-disallow esp_call_pkt_comp scsi_watch_request_intr
-
-add notify_entry::callback target warlock_dummy
-
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-root    scsi_hba_bus_power
-ignore  delay
-
-root	st_bigblk_xfer_done
diff --git a/usr/src/uts/common/io/warlock/st_with_fas.wlcmd b/usr/src/uts/common/io/warlock/st_with_fas.wlcmd
deleted file mode 100644
index cd1deb4379..0000000000
--- a/usr/src/uts/common/io/warlock/st_with_fas.wlcmd
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-add scsi_watch_request::swr_callback targets \
-	st.c:st_media_watch_cb
-
-add scsi_pkt::pkt_comp targets \
-        st.c:st_media_watch_cb \
-	scsi_watch.c:scsi_watch_request_intr \
-	st.c:st_intr \
-	fas.c:fas_scsi_destroy_pkt \
-	fas.c:fas_scsi_init_pkt \
-	fas.c:fas_scsi_start \
-	fas.c:fas_scsi_abort \
-	fas.c:fas_scsi_reset \
-	fas.c:fas_scsi_setcap \
-	fas.c:fas_scsi_getcap \
-	fas.c:fas_scsi_dmafree \
-	fas.c:fas_scsi_reset_notify \
-	fas.c:fas_scsi_sync_pkt
-
-add notify_entry::callback target warlock_dummy
-
-add st.c:st_known_tape_type/config_funct targets \
-        st_get_conf_from_st_dot_conf \
-        st_get_conf_from_st_conf_dot_c \
-	st_get_conf_from_tape_drive \
-        st_get_default_conf  
-
-one scsi_device
-one fas 
-
-root fas_kmem_cache_constructor fas_kmem_cache_destructor
-root fas.c:fas_scsi_dmafree fas.c:fas_scsi_sync_pkt
-
-# choose one of the two for finding problems:
-#
-assert order scsi_device::sd_mutex  fas::f_mutex
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-root    scsi_hba_bus_power
-ignore  delay
-
-root	st_bigblk_xfer_done
diff --git a/usr/src/uts/common/io/warlock/st_with_glm.wlcmd b/usr/src/uts/common/io/warlock/st_with_glm.wlcmd
deleted file mode 100644
index d31bbdc0e2..0000000000
--- a/usr/src/uts/common/io/warlock/st_with_glm.wlcmd
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-add scsi_watch_request::swr_callback targets \
-	st.c:st_media_watch_cb
-
-add scsi_pkt::pkt_comp targets \
-        st.c:st_media_watch_cb \
-	scsi_watch.c:scsi_watch_request_intr \
-	st.c:st_intr \
-	glm.c:glm_scsi_destroy_pkt \
-	glm.c:glm_scsi_init_pkt \
-	glm.c:glm_scsi_start \
-	glm.c:glm_scsi_abort \
-	glm.c:glm_scsi_reset \
-	glm.c:glm_scsi_setcap \
-	glm.c:glm_scsi_getcap \
-	glm.c:glm_scsi_dmafree \
-	glm.c:glm_scsi_reset_notify \
-	glm.c:glm_scsi_tgt_init \
-	glm.c:glm_scsi_tgt_free \
-	glm.c:glm_scsi_sync_pkt
-
-add notify_entry::callback target warlock_dummy
-
-add st.c:st_known_tape_type/config_funct targets \
-        st_get_conf_from_st_dot_conf \
-        st_get_conf_from_st_conf_dot_c \
-	st_get_conf_from_tape_drive \
-        st_get_default_conf  
-
-one scsi_device
-one glm
-
-root glm_kmem_cache_destructor glm_kmem_cache_constructor
-assert order scsi_device::sd_mutex  glm::g_mutex
-
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-root    scsi_hba_bus_power
-ignore  delay
-
-
-root	st_bigblk_xfer_done
diff --git a/usr/src/uts/common/io/warlock/st_with_isp.wlcmd b/usr/src/uts/common/io/warlock/st_with_isp.wlcmd
deleted file mode 100644
index ca91257e19..0000000000
--- a/usr/src/uts/common/io/warlock/st_with_isp.wlcmd
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-add scsi_watch_request::swr_callback targets \
-	st.c:st_media_watch_cb
-
-add scsi_pkt::pkt_comp targets \
-        st.c:st_media_watch_cb \
-	scsi_watch.c:scsi_watch_request_intr \
-	st.c:st_intr
-
-add st.c:st_known_tape_type/config_funct targets \
-        st_get_conf_from_st_dot_conf \
-        st_get_conf_from_st_conf_dot_c \
-	st_get_conf_from_tape_drive \
-        st_get_default_conf  
-
-one scsi_device
-one isp 
-
-add notify_entry::callback target warlock_dummy
-
-root isp_kmem_cache_constructor isp_kmem_cache_destructor
-root isp.c:isp_scsi_dmafree isp.c:isp_scsi_sync_pkt
-root isp.c:isp_scsi_reset_notify
-root isp.c:isp_i_print_response
-
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-root    scsi_hba_bus_power
-ignore  delay
-
-
-root	st_bigblk_xfer_done
diff --git a/usr/src/uts/common/io/warlock/tavor.wlcmd b/usr/src/uts/common/io/warlock/tavor.wlcmd
deleted file mode 100644
index 93338f562c..0000000000
--- a/usr/src/uts/common/io/warlock/tavor.wlcmd
+++ /dev/null
@@ -1,144 +0,0 @@
-#
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-one tavor_state_s
-
-### IBTF CI interface entry points
-root	tavor_ci_query_hca_ports
-root	tavor_ci_modify_ports
-root	tavor_ci_modify_system_image
-root	tavor_ci_alloc_pd
-root	tavor_ci_free_pd
-root	tavor_ci_alloc_rdd
-root	tavor_ci_free_rdd
-root	tavor_ci_alloc_ah
-root	tavor_ci_free_ah
-root	tavor_ci_query_ah
-root	tavor_ci_modify_ah
-root	tavor_ci_alloc_qp
-root	tavor_ci_alloc_special_qp
-root	tavor_ci_alloc_qp_range
-root	tavor_ci_free_qp
-root	tavor_ci_release_qpn
-root	tavor_ci_query_qp
-root	tavor_ci_modify_qp
-root	tavor_ci_alloc_cq
-root	tavor_ci_free_cq
-root	tavor_ci_query_cq
-root	tavor_ci_resize_cq
-root	tavor_ci_modify_cq
-root	tavor_ci_alloc_cq_sched
-root	tavor_ci_free_cq_sched
-root	tavor_ci_alloc_eec
-root	tavor_ci_free_eec
-root	tavor_ci_query_eec
-root	tavor_ci_modify_eec
-root	tavor_ci_register_mr
-root	tavor_ci_register_buf
-root	tavor_ci_register_shared_mr
-root	tavor_ci_deregister_mr
-root	tavor_ci_query_mr
-root	tavor_ci_reregister_mr
-root	tavor_ci_reregister_buf
-root	tavor_ci_sync_mr
-root	tavor_ci_alloc_mw
-root	tavor_ci_free_mw
-root	tavor_ci_query_mw
-root	tavor_ci_attach_mcg
-root	tavor_ci_detach_mcg
-root	tavor_ci_post_send
-root	tavor_ci_post_recv
-root	tavor_ci_poll_cq
-root	tavor_ci_notify_cq
-root	tavor_ci_ci_data_in
-root	tavor_ci_ci_data_out
-root	tavor_ci_alloc_srq
-root	tavor_ci_free_srq
-root	tavor_ci_query_srq
-root	tavor_ci_modify_srq
-root	tavor_ci_post_srq
-root	tavor_ci_map_mem_area
-root	tavor_ci_unmap_mem_area
-root	tavor_ci_alloc_lkey
-root	tavor_ci_register_physical_mr
-root	tavor_ci_reregister_physical_mr
-root	tavor_ci_create_fmr_pool
-root	tavor_ci_destroy_fmr_pool
-root	tavor_ci_flush_fmr_pool
-root	tavor_ci_register_physical_fmr
-root	tavor_ci_deregister_fmr
-root	tavor_ci_map_mem_iov
-root	tavor_ci_unmap_mem_iov
-root	tavor_ci_alloc_io_mem
-root	tavor_ci_free_io_mem
-root	tavor_ci_register_dma_mr
-root	tavor_ci_not_supported
-
-### Tavor Firmware commands (currently unused)
-root	tavor_sync_tpt_cmd_post
-root	tavor_write_mtt_cmd_post
-
-### Tavor Event Queue function pointers
-add	tavor_eq_poll/eqfunction targets tavor_cq_handler		\
-    tavor_cq_err_handler tavor_comm_estbl_handler			\
-    tavor_port_state_change_handler tavor_invreq_local_wq_err_handler	\
-    tavor_local_acc_vio_wq_err_handler \
-    tavor_path_mig_handler tavor_path_mig_err_handler			\
-    tavor_local_wq_cat_err_handler tavor_sendq_drained_handler		\
-    tavor_eq_overflow_handler tavor_cmd_complete_handler		\
-    tavor_srq_catastrophic_handler tavor_srq_last_wqe_reached_handler	\
-    tavor_ecc_detection_handler tavor_no_eqhandler
-
-### Tavor agent callbacks
-root	tavor_agent_handle_req
-root	tavor_agent_request_cb
-root	tavor_agent_response_cb
-
-### Tavor kmem_cache constructors and destructors
-root	tavor_rsrc_cqhdl_constructor
-root	tavor_rsrc_cqhdl_destructor
-root	tavor_rsrc_qphdl_constructor
-root	tavor_rsrc_qphdl_destructor
-root	tavor_rsrc_pdhdl_constructor
-root	tavor_rsrc_pdhdl_destructor
-root	tavor_rsrc_refcnt_constructor
-root	tavor_rsrc_refcnt_destructor
-root	tavor_rsrc_ahhdl_constructor
-root	tavor_rsrc_ahhdl_destructor
-root	tavor_rsrc_mrhdl_constructor
-root	tavor_rsrc_mrhdl_destructor
-root	tavor_rsrc_srqhdl_constructor
-root	tavor_rsrc_srqhdl_destructor
-
-### Tavor kstat callback
-root	tavor_kstat_cntr_update
-root	tavor_kstat_perfcntr64_update
-
-### Tavor userland mapping callbacks and functions
-root	tavor_umap_umemlock_cb
-root	tavor_devmap_umem_map
-root	tavor_devmap_umem_dup
-root	tavor_devmap_umem_unmap
-root	tavor_devmap_devmem_map
-root	tavor_devmap_devmem_dup
-root	tavor_devmap_devmem_unmap
-root	tavor_umap_db_compare
-add	tavor_umap_umemlock_cb/mr_callback	targets warlock_dummy
-
-
-### Tavor cleanup on close callback(s)
-add	tavor_umap_db_handle_onclose_cb/callback targets \
-    tavor_ioctl_flash_cleanup
-
-### Tavor QP number AVL tree compare function
-root	tavor_qpn_avl_compare
-
-add	bus_ops::bus_add_eventcall	targets warlock_dummy
-add	bus_ops::bus_get_eventcookie	targets warlock_dummy
-add	bus_ops::bus_post_event		targets warlock_dummy
-add	bus_ops::bus_remove_eventcall	targets warlock_dummy
-add	bus_ops::bus_intr_ctl		targets warlock_dummy
-add	bus_ops::bus_config		targets warlock_dummy
-add	bus_ops::bus_unconfig		targets warlock_dummy
-
diff --git a/usr/src/uts/common/io/warlock/tem.wlcmd b/usr/src/uts/common/io/warlock/tem.wlcmd
deleted file mode 100644
index 488aef0ed3..0000000000
--- a/usr/src/uts/common/io/warlock/tem.wlcmd
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-add	bus_ops::bus_add_eventcall	target	warlock_dummy
-add	bus_ops::bus_config		target  warlock_dummy
-add	bus_ops::bus_get_eventcookie	target  warlock_dummy
-add	bus_ops::bus_intr_ctl		target  warlock_dummy
-add	bus_ops::bus_post_event		target  warlock_dummy
-add	bus_ops::bus_remove_eventcall	target  warlock_dummy
-add	bus_ops::bus_unconfig		target  warlock_dummy
-add	tems_modechange_callback/cb	target	warlock_dummy
-add	vis_polledio::copy		target	warlock_dummy
-add	vis_polledio::cursor		target	warlock_dummy
-add	vis_polledio::display		target	warlock_dummy
-add	tem_safe_callbacks::tsc_display	target	tem_safe_text_display
-add	tem_safe_callbacks::tsc_display	target	tem_safe_pix_display
-add	tem_safe_callbacks::tsc_copy	target	tem_safe_text_copy
-add	tem_safe_callbacks::tsc_copy	target	tem_safe_pix_copy
-add	tem_safe_callbacks::tsc_cursor	target	tem_safe_text_cursor
-add	tem_safe_callbacks::tsc_cursor	target	tem_safe_pix_cursor
-add	tem_safe_callbacks::tsc_bit2pix	target	tem_safe_pix_bit2pix
-add	tem_safe_callbacks::tsc_cls	target	tem_safe_text_cls
-add	tem_safe_callbacks::tsc_cls	target	tem_safe_pix_cls
-
-root	tem_initialized
-root	tem_get_size
-root	tem_info_init
-root	tem_init
-root	tem_register_modechg_cb
-root	tem_write
-root	tems_modechange_callback
-root	tem_safe_polled_write
-root	tem_activate
-root	tem_destroy
-root	tem_safe_image_display
-root	tem_switch
-root	tem_get_fbmode
-root	tem_set_fbmode
diff --git a/usr/src/uts/common/io/warlock/uata.wlcmd b/usr/src/uts/common/io/warlock/uata.wlcmd
deleted file mode 100644
index 125ef76873..0000000000
--- a/usr/src/uts/common/io/warlock/uata.wlcmd
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-### Warlock commands for analyzing the uata driver alone.
-
-### Tell warlock there's only one ata_controller struct, so that it will 
-### complain if the lock is acquired when it is already locked.
-
-one ata_controller
-
-### Tell warlock where calls through pkt_comp go.
-
-add dcd_pkt::pkt_comp targets \
-	ata_disk_tran_start \
-	ata_disk_tran_reset \
-	ata_disk_tran_abort \
-	ata_disk_tran_init_pkt \
-	ata_disk_tran_destroy_pkt \
-	ata_disk_tran_tgt_init
-
-add scsi_pkt::pkt_comp targets \
-	atapi_tran_start \
-	atapi_tran_abort \
-	atapi_tran_init_pkt \
-	atapi_tran_destroy_pkt \
-	atapi_tran_dmafree \
-	atapi_tran_sync_pkt \
-	atapi_tran_getcap \
-	atapi_tran_setcap \
-	atapi_tran_reset \
-	atapi_tran_tgt_free \
-	atapi_tran_tgt_init \
-	ata_disk_tran_tgt_probe
-	
-	
-add dcd_hba_tran::tran_tgt_init target ata_disk_tran_tgt_init 
-add scsi_hba_tran::tran_tgt_init target atapi_tran_tgt_init
-
-add dcd_hba_tran::tran_tgt_probe target ata_disk_tran_tgt_probe 
-add scsi_hba_tran::tran_tgt_probe target atapi_tran_tgt_probe
-add scsi_hba_tran::tran_bus_power target warlock_dummy
-
-add dcd_hba_tran::tran_start  target ata_disk_tran_start
-add scsi_hba_tran::tran_start  target atapi_tran_start
-
-add dcd_hba_tran::tran_reset target ata_disk_tran_reset
-
-add dcd_hba_tran::tran_abort target ata_disk_tran_abort
-add scsi_hba_tran::tran_abort target atapi_tran_abort
-
-add dcd_hba_tran::tran_init_pkt target ata_disk_tran_init_pkt
-add scsi_hba_tran::tran_init_pkt target atapi_tran_init_pkt
-
-add dcd_hba_tran::tran_destroy_pkt  target ata_disk_tran_destroy_pkt
-add scsi_hba_tran::tran_destroy_pkt  target atapi_tran_destroy_pkt
-
-add scsi_hba_tran::tran_dmafree target atapi_tran_dmafree
-
-add scsi_hba_tran::tran_sync_pkt target atapi_tran_sync_pkt
-
-add scsi_hba_tran::tran_tgt_free target atapi_tran_tgt_free
-
-add scsi_hba_tran::tran_getcap target atapi_tran_getcap
-
-add scsi_hba_tran::tran_setcap target atapi_tran_setcap
-
-add ata_pkt::ap_start targets \
-	atapi_start \
-	ata_disk_start
-
-add ata_pkt::ap_intr targets \
-	atapi_intr \
-	ata_disk_intr
-
-add ata_pkt::ap_complete targets \
-	atapi_complete \
-	ata_disk_complete
-
-add     scsi_hba_tran::tran_bus_config targets warlock_dummy
-add     scsi_hba_tran::tran_bus_unconfig targets warlock_dummy
-
-add cmd_ctl::ccc_hba_start target ata_hba_start
-add cmd_ctl::ccc_hba_complete target ata_hba_complete
-add cmd_ctl::ccc_process_intr target ata_process_intr
-add cmd_ctl::ccc_get_status target ata_get_status
-add cmd_ctl::ccc_timeout_func target ata_timeout_func
-add processfunc target ata_process_intr
-add statfunc target ata_get_status 
-
-### Ignore the following functions as they are never used
-ignore L1_remove ata_disk_init_reset ghd_doneq_put ghd_gcmd_alloc
-ignore ghd_gcmd_free ghd_timer_stop ghd_tran_sync_pkt
-ignore scsi_htos_3byte scsi_htos_long scsi_htos_short scsi_stoh_3byte
-ignore scsi_stoh_long scsi_stoh_short
-
-### The following are not used by our code 
-add cmd_ctl::ccc_ccballoc target warlock_dummy
-add cmd_ctl::ccc_ccbfree target warlock_dummy
-
-
-root atapi_signature
-root scsi_hba_bus_power
-root ghd_pktfree
-root ghd_scsa.c:ghd_pktalloc
diff --git a/usr/src/uts/common/io/warlock/ugen.wlcmd b/usr/src/uts/common/io/warlock/ugen.wlcmd
deleted file mode 100644
index 7d652686c5..0000000000
--- a/usr/src/uts/common/io/warlock/ugen.wlcmd
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-
-### specify the root functions
-
-root	ugen_skel_disconnect_ev_cb ugen_skel_reconnect_ev_cb
-
-add     bus_ops::bus_add_eventcall targets warlock_dummy
-add     bus_ops::bus_get_eventcookie targets warlock_dummy
-add     bus_ops::bus_post_event targets warlock_dummy
-add     bus_ops::bus_remove_eventcall targets warlock_dummy
-add     bus_ops::bus_intr_ctl targets warlock_dummy
-add     bus_ops::bus_config targets warlock_dummy
-add     bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/ugen_with_usba.wlcmd b/usr/src/uts/common/io/warlock/ugen_with_usba.wlcmd
deleted file mode 100644
index a09bd9ad38..0000000000
--- a/usr/src/uts/common/io/warlock/ugen_with_usba.wlcmd
+++ /dev/null
@@ -1,145 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usba_pipe_handle_data
-one usba_ph_impl
-one hubd
-one usba_device
-
-### specify the root functions
-
-root	usb_console_output_init
-root	usb_console_output_fini
-root	usb_console_output_enter
-root	usb_console_output_exit
-root	usb_console_write
-root	usb_console_input_enter
-root	usb_console_input_exit
-root	usb_console_read
-root	usb_get_dev_descr
-root	usb_parse_CV_cfg_descr
-root	usb_parse_CV_ep_descr
-root	usb_parse_CV_if_descr
-root	usb_parse_comp_ep_descr
-root	usb_pipe_get_private
-root	usb_get_max_isoc_pkts
-root	usb_pipe_set_private
-root	usb_req_raise_power
-root	usb_req_lower_power
-root	usb_pipe_bulk_transfer_size
-root	usba_pipe_get_policy
-root	usb_pipe_ctrl_xfer_wait
-root	usb_try_serialize_access
-root	usb_get_current_frame_number
-root    usb_alloc_bulk_req
-root    usb_clear_feature
-root    usb_get_alt_if
-root    usb_get_ep_descr
-root    usb_get_if_descr
-root    usb_pipe_bulk_xfer
-root    usb_pipe_isoc_xfer
-root    usb_pipe_stop_isoc_polling
-root    usb_set_alt_if
-root    usb_set_cfg
-root	usb_ep_num
-root	usb_console_input_fini
-root	usb_console_input_init
-root	usb_print_descr_tree
-root	usb_clr_feature
-root	usb_get_ep_data
-root	usb_register_hotplug_cbs
-root	usb_is_pm_enabled
-root    usb_register_client
-root	usb_reset_device
-root	usb_register_dev_driver
-root	usb_unregister_dev_driver
-
-root	usba_common_power
-root	usba_common_register_events
-root	usba_ready_interface_association_node
-root	usba_free_hcdi_ops
-root	usba_ready_interface_node
-root	usba_async_req_raise_power
-root	usba_async_req_lower_power
-root    usba_get_hc_dma_attr
-root    usba_hcdi_get_req_private
-root    usba_hcdi_set_req_private
-root	usba_pipe_do_async_func_thread
-root	usba_get_hotplug_stats
-root	usba_reset_hotplug_stats
-root    usba_dbuf_tail
-root	usba_move_list
-root    usba_taskq_destroy
-root	usba_mk_mctl
-root	usb_fail_checkpoint
-
-root	hcdi_autoclearing
-root	hcdi_cb_thread
-root    hcdi_shared_cb_thread
-
-root	hubd_hotplug_thread
-root	hubd_reset_thread
-root	hubd_cpr_post_user_callb
-root	hubd_restore_state_cb
-root    hubd_disconnect_event_cb
-root    hubd_post_resume_event_cb
-root    hubd_pre_suspend_event_cb
-root    hubd_reconnect_event_cb
-root	hubd_root_hub_cleanup_thread
-root	hubd_bus_power
-root	ehci_quiesce
-root	uhci_quiesce
-root	ohci_quiesce
-
-### specify the ugen root functions
-root    ugen_skel_disconnect_ev_cb
-root    ugen_skel_reconnect_ev_cb
-
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_close
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_reset
-
-add usba_pipe_async_req::callback targets warlock_dummy
-add usb_bulk_req::bulk_cb targets warlock_dummy
-add usb_bulk_req::bulk_exc_cb targets warlock_dummy
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usb_intr_req::intr_cb targets warlock_dummy
-add usb_intr_req::intr_exc_cb targets warlock_dummy
-add hubd::h_cleanup_child targets warlock_dummy
-
-add usba_pm_req::cb targets warlock_dummy
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add usba_hcdi_ops::usba_hcdi_console_input_init targets \
-                                                ohci_hcdi_polled_input_init
-add usba_hcdi_ops::usba_hcdi_console_input_fini targets \
-                                                ohci_hcdi_polled_input_fini
diff --git a/usr/src/uts/common/io/warlock/uhci.wlcmd b/usr/src/uts/common/io/warlock/uhci.wlcmd
deleted file mode 100644
index c8c03f24e9..0000000000
--- a/usr/src/uts/common/io/warlock/uhci.wlcmd
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-one uhci_state
-one usba_device
-one usba_pipe_handle_data
-one usba_ph_impl
-
-### specify the root functions 
-
-### hcdi entry points
-root	uhci_hcdi_pipe_open 
-root	uhci_hcdi_pipe_close 
-root	uhci_hcdi_pipe_stop_intr_polling 
-root	uhci_hcdi_pipe_stop_isoc_polling 
-root	uhci_hcdi_pipe_reset
-root	uhci_hcdi_pipe_reset_data_toggle
-root	uhci_hcdi_bulk_transfer_size
-root	uhci_hcdi_get_current_frame_number
-root	uhci_hcdi_get_max_isoc_pkts
-root	uhci_intr
-root	uhci_hcdi_pipe_ctrl_xfer
-root	uhci_hcdi_pipe_bulk_xfer
-root	uhci_hcdi_pipe_intr_xfer
-root	uhci_hcdi_pipe_isoc_xfer
-root	uhci_quiesce
-
-root 	hubd_hotplug_thread
-root 	hubd_exception_cb
-root 	hubd_read_cb
-root 	hubd_disconnect_event_cb
-root 	hubd_post_resume_event_cb
-root 	hubd_pre_suspend_event_cb
-root 	hubd_reconnect_event_cb
-root	hubd_bus_power
-
-root	hcdi_cb_thread
-root    hcdi_shared_cb_thread
-
-
-### POLLED entry points
-root   uhci_hcdi_polled_input_init
-root   uhci_hcdi_polled_input_fini
-root   uhci_hcdi_polled_input_enter
-root   uhci_hcdi_polled_input_exit
-root   uhci_hcdi_polled_read
-root   uhci_hcdi_polled_output_init
-root   uhci_hcdi_polled_output_fini
-root   uhci_hcdi_polled_output_enter
-root   uhci_hcdi_polled_output_exit
-root   uhci_hcdi_polled_write
- 
-### currently unused functions
- 
-root	uhci_print_td
-root	usba_pipe_sync_close
-
-add uhci_trans_wrapper::tw_handle_td targets uhci_handle_bulk_td
-add uhci_trans_wrapper::tw_handle_td targets uhci_handle_intr_td
-add uhci_trans_wrapper::tw_handle_td targets uhci_handle_ctrl_td
-add uhci_trans_wrapper::tw_handle_td targets uhci_handle_isoc_td
-
-add usba_hcdi_ops::usba_hcdi_console_input_init targets \
-						uhci_hcdi_polled_input_init
-add usba_hcdi_ops::usba_hcdi_console_input_fini targets \
-						uhci_hcdi_polled_input_fini
-add usb_bulk_req::bulk_cb targets warlock_dummy
-add usb_bulk_req::bulk_exc_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-add usb_intr_req::intr_cb targets hubd_read_cb
-add usb_intr_req::intr_exc_cb targets hubd_exception_cb
diff --git a/usr/src/uts/common/io/warlock/usb_ac.wlcmd b/usr/src/uts/common/io/warlock/usb_ac.wlcmd
deleted file mode 100644
index 8436bdcf91..0000000000
--- a/usr/src/uts/common/io/warlock/usb_ac.wlcmd
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-one usb_ac_state
-
-### specify the root functions
-root usb_ac_open
-root usb_ac_close
-
-root usb_ac_disconnect_event_cb
-root usb_ac_reconnect_event_cb
-root usb_ac_power
-
-root usb_ac_set_format
-root usb_ac_setup
-root usb_ac_start_play
-root usb_ac_start_record
-root usb_ac_stop_play
-root usb_ac_stop_record
-root usb_ac_teardown
-
-root usb_ac_get_audio
-root usb_ac_send_audio
-root usb_ac_ctrl_restore
-root usb_audio_set_mute 
-
-root usb_engine_start 
-root usb_engine_stop 
-root usb_engine_sync 
-root usb_engine_rate 
-root usb_engine_format 
-root usb_engine_count 
-root usb_engine_close 
-root usb_engine_channels 
-root usb_engine_open 
-root usb_engine_qlen 
-
-root usb_ac_mux_plumbing_tq
-root usb_ac_mux_unplumbing_tq
-root usb_ac_reader
-
-root usb_audio_write_monitor_gain
-root usb_audio_write_mono_rec
-root usb_audio_write_mono_vol
-root usb_audio_write_ster_vol
-root usb_audio_write_stero_rec 
-root usb_audio_write_rec_src
-root usb_audio_write_mic_boost 
-root usb_audio_ctrl_read
-
-add  bus_ops::bus_add_eventcall targets warlock_dummy
-add  bus_ops::bus_get_eventcookie targets warlock_dummy
-add  bus_ops::bus_post_event targets warlock_dummy
-add  bus_ops::bus_remove_eventcall targets warlock_dummy
-add  bus_ops::bus_intr_ctl targets warlock_dummy
-add  bus_ops::bus_config targets warlock_dummy
-add  bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usb_ac_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usb_ac_with_usba.wlcmd
deleted file mode 100644
index b557303fe5..0000000000
--- a/usr/src/uts/common/io/warlock/usb_ac_with_usba.wlcmd
+++ /dev/null
@@ -1,221 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usb_ac_state
-one usba_pipe_handle_data
-one usba_ph_impl
-one hubd
-one usba_device
-
-### specify the root functions
-root	usb_console_output_init
-root	usb_console_output_fini
-root	usb_console_output_enter
-root	usb_console_output_exit
-root	usb_console_write
-root	usb_console_input_enter
-root	usb_console_input_exit
-root	usb_console_input_fini
-root	usb_console_input_init
-root	usb_console_read
-root	usb_get_dev_descr
-root	usb_get_if_number
-root	usb_parse_CV_cfg_descr
-root	usb_parse_CV_ep_descr
-root	usb_parse_CV_if_descr
-root	usb_parse_comp_ep_descr
-root	usb_pipe_get_private
-root	usb_get_current_frame_number
-root	usb_get_max_isoc_pkts
-root	usb_pipe_set_private
-root	usb_req_raise_power
-root	usb_req_lower_power
-root    usb_rval2errno
-root	usb_set_device_pwrlvl0
-root	usb_set_device_pwrlvl1
-root	usb_set_device_pwrlvl2
-root	usb_set_device_pwrlvl3
-root	usb_is_pm_enabled
-root	usb_async_req
-root	usb_pipe_bulk_transfer_size
-root	usb_log
-root    usb_alloc_bulk_req
-root    usb_clear_feature
-root    usb_get_alt_if
-root    usb_get_ep_descr
-root    usb_get_if_descr
-root    usb_pipe_isoc_xfer
-root    usb_pipe_stop_isoc_polling
-root    usb_set_alt_if
-root    usb_set_cfg
-root    usb_get_cfg
-root	usb_ep_num
-root	usb_get_status
-root	usb_pipe_reset
-root	usb_pipe_bulk_xfer
-root	usb_get_ep_data
-root    usb_log_descr_tree
-root    usb_print_descr_tree
-root	usb_pipe_ctrl_xfer_wait
-root	usb_pipe_drain_reqs
-root	usb_try_serialize_access
-root	usb_free_bulk_req
-root	usb_fini_serialization
-root	usb_clr_feature
-root	usb_register_hotplug_cbs
-root	usb_get_current_cfgidx
-root    usb_register_client
-root	usb_reset_device
-root    usb_register_dev_driver
-root    usb_unregister_dev_driver
-
-
-root	hcdi_autoclearing
-root	hcdi_cb_thread
-root    hcdi_shared_cb_thread
-
-root    ohci_quiesce
-root    uhci_quiesce
-root    ehci_quiesce
-
-root 	usb_ugen_attach
-root    usb_ugen_close
-root    usb_ugen_detach
-root    usb_ugen_disconnect_ev_cb
-root    usb_ugen_get_hdl
-root    usb_ugen_open
-root    usb_ugen_poll
-root    usb_ugen_power
-root    usb_ugen_read
-root    usb_ugen_reconnect_ev_cb
-root    usb_ugen_write
-
-root	usba_common_power
-root	usba_common_register_events
-root	usba_ready_interface_association_node
-root	usba_pipe_get_policy
-root    usba_get_hc_dma_attr
-root    usba_hcdi_get_req_private
-root    usba_hcdi_set_req_private
-root	usba_pipe_do_async_func_thread
-root	usba_pipe_sync_reset
-root    usba_dbuf_tail
-root	hubd_bus_power
-root	usba_hubdi_power
-root	usba_hubdi_root_hub_power
-root	usba_get_hotplug_stats
-root	usba_reset_hotplug_stats
-root	usba_ready_interface_node
-root	usba_free_hcdi_ops
-root	usba_async_req_raise_power
-root	usba_async_req_lower_power
-root	usba_ascii_string_descr
-root	usba_move_list
-root    usba_taskq_destroy
-root	usba_mk_mctl
-root	usb_fail_checkpoint
-
-
-root	hubd_restore_state_cb
-root	hubd_root_hub_cleanup_thread
-root    hubd_disconnect_event_cb
-root    hubd_post_resume_event_cb
-root    hubd_pre_suspend_event_cb
-root    hubd_reconnect_event_cb
-root	hubd_hotplug_thread
-root	hubd_reset_thread
-root	hubd_cpr_post_user_callb
-
-root	ohci_intr
-root	ehci_intr
-
-### specify the usb_ac root functions
-root usb_ac_open
-root usb_ac_close
-root usb_ac_disconnect_event_cb
-root usb_ac_reconnect_event_cb
-root usb_ac_power
-root usb_ac_set_format
-root usb_ac_setup
-root usb_ac_start_play
-root usb_ac_start_record
-root usb_ac_stop_play
-root usb_ac_stop_record
-root usb_ac_teardown
-
-root usb_ac_get_audio
-root usb_ac_send_audio
-root usb_ac_ctrl_restore
-root usb_audio_set_mute 
-
-root usb_engine_start 
-root usb_engine_stop 
-root usb_engine_sync 
-root usb_engine_rate 
-root usb_engine_format 
-root usb_engine_count 
-root usb_engine_close 
-root usb_engine_channels 
-root usb_engine_open 
-root usb_engine_qlen 
-
-root usb_ac_mux_plumbing_tq
-root usb_ac_mux_unplumbing_tq
-root usb_ac_reader
-
-root usb_audio_write_monitor_gain
-root usb_audio_write_mono_rec
-root usb_audio_write_mono_vol
-root usb_audio_write_ster_vol
-root usb_audio_write_stero_rec 
-root usb_audio_write_rec_src
-root usb_audio_write_mic_boost 
-root usb_audio_ctrl_read
-
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_close
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_reset
-
-add usba_pipe_async_req::callback targets warlock_dummy
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usb_bulk_req::bulk_cb targets warlock_dummy
-add usb_bulk_req::bulk_exc_cb targets warlock_dummy
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-
-add usba_pm_req::cb targets warlock_dummy
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-
diff --git a/usr/src/uts/common/io/warlock/usb_ah.wlcmd b/usr/src/uts/common/io/warlock/usb_ah.wlcmd
deleted file mode 100644
index 73fb5a1808..0000000000
--- a/usr/src/uts/common/io/warlock/usb_ah.wlcmd
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-### specify the root functions
-
-root usb_ah_open
-root usb_ah_close 
-root usb_ah_wput
-root usb_ah_rput
-root usb_ah_timeout
-
-add        bus_ops::bus_add_eventcall targets warlock_dummy
-add        bus_ops::bus_get_eventcookie targets warlock_dummy
-add        bus_ops::bus_post_event targets warlock_dummy
-add        bus_ops::bus_remove_eventcall targets warlock_dummy
-add        bus_ops::bus_intr_ctl targets warlock_dummy
-
-add        bus_ops::bus_config targets warlock_dummy
-add        bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usb_as.wlcmd b/usr/src/uts/common/io/warlock/usb_as.wlcmd
deleted file mode 100644
index 4016abb9de..0000000000
--- a/usr/src/uts/common/io/warlock/usb_as.wlcmd
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-
-one usb_as_state
-
-### specify the root functions
-root usb_as_disconnect_event_cb
-root usb_as_reconnect_event_cb
-
-root usb_as_open
-root usb_as_close
-
-root usb_as_power
-
-root usb_as_play_cb
-root usb_as_play_exc_cb
-root usb_as_record_cb
-root usb_as_record_exc_cb
-
-add	   bus_ops::bus_add_eventcall targets warlock_dummy
-add	   bus_ops::bus_get_eventcookie targets warlock_dummy
-add	   bus_ops::bus_post_event targets warlock_dummy
-add	   bus_ops::bus_remove_eventcall targets warlock_dummy
-add	   bus_ops::bus_intr_ctl targets warlock_dummy
-add        bus_ops::bus_config targets warlock_dummy
-add        bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usb_as_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usb_as_with_usba.wlcmd
deleted file mode 100644
index e2a932c3c3..0000000000
--- a/usr/src/uts/common/io/warlock/usb_as_with_usba.wlcmd
+++ /dev/null
@@ -1,179 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usb_as_state
-
-### specify the root functions
-
-root	usb_console_output_init
-root	usb_console_output_fini
-root	usb_console_output_enter
-root	usb_console_output_exit
-root	usb_console_write
-root	usb_console_input_enter
-root	usb_console_input_exit
-root	usb_console_input_fini
-root	usb_console_input_init
-root	usb_console_read
-root	usb_get_dev_descr
-root	usb_get_if_number
-root	usb_parse_CV_cfg_descr
-root	usb_parse_CV_ep_descr
-root	usb_parse_CV_if_descr
-root	usb_parse_comp_ep_descr
-root	usb_pipe_get_private
-root	usb_get_current_frame_number
-root	usb_get_max_isoc_pkts
-root	usb_pipe_set_private
-root	usba_ready_interface_node
-root	usba_free_hcdi_ops
-root	usba_async_req_raise_power
-root	usba_async_req_lower_power
-root	usb_req_raise_power
-root	usb_req_lower_power
-root	usb_set_device_pwrlvl0
-root	usb_set_device_pwrlvl1
-root	usb_set_device_pwrlvl2
-root	usb_set_device_pwrlvl3
-root	usb_is_pm_enabled
-root	usb_async_req
-root	usb_pipe_bulk_transfer_size
-root	usb_log
-root    usb_alloc_bulk_req
-root    usb_clear_feature
-root    usb_get_alt_if
-root    usb_get_ep_descr
-root    usb_get_if_descr
-root    usb_pipe_isoc_xfer
-root    usb_pipe_stop_isoc_polling
-root    usb_set_alt_if
-root    usb_set_cfg
-root    usb_get_cfg
-root	usb_ep_num
-root	usb_get_status
-root	usb_pipe_reset
-root	usb_pipe_bulk_xfer
-root    usb_log_descr_tree
-root    usb_print_descr_tree
-root	usb_pipe_ctrl_xfer_wait
-root	usb_pipe_drain_reqs
-root    usb_rval2errno
-root	usb_free_bulk_req
-root	usb_try_serialize_access
-root	usb_clr_feature
-root	usb_get_ep_data
-root	usb_register_hotplug_cbs
-root	usb_get_current_cfgidx
-root    usb_register_client
-root	usb_reset_device
-root    usb_register_dev_driver
-root    usb_unregister_dev_driver
-
-root    ohci_quiesce
-root    uhci_quiesce
-root    ehci_quiesce
-
-root    usb_ugen_attach
-root    usb_ugen_close
-root    usb_ugen_detach
-root    usb_ugen_disconnect_ev_cb
-root    usb_ugen_get_hdl
-root    usb_ugen_open
-root    usb_ugen_poll
-root    usb_ugen_power
-root    usb_ugen_read
-root    usb_ugen_reconnect_ev_cb
-root    usb_ugen_write
-
-### specify the usb_as root functions
-root	usb_as_open
-root	usb_as_close
-root	usb_as_disconnect_event_cb
-root	usb_as_reconnect_event_cb
-root	usb_as_power
-
-root	usb_as_play_cb
-root	usb_as_play_exc_cb
-root	usb_as_record_cb
-root	usb_as_record_exc_cb
-
-root	usba_common_power
-root	usba_common_register_events
-root	usba_ready_interface_association_node
-root    usba_dbuf_tail
-root	usba_hubdi_power
-root	usba_hubdi_root_hub_power
-root	usba_get_hotplug_stats
-root	usba_reset_hotplug_stats
-root	usba_ascii_string_descr
-root	usba_pipe_get_policy
-
-root	usba_get_hc_dma_attr
-root	usba_hcdi_get_req_private
-root	usba_hcdi_set_req_private
-root	usba_pipe_do_async_func_thread
-root	usba_move_list
-root    usba_taskq_destroy
-root	usba_mk_mctl
-root	usb_fail_checkpoint
-
-root	hcdi_autoclearing
-root	hcdi_cb_thread
-root	hcdi_shared_cb_thread
-
-root    hubd_root_hub_cleanup_thread
-root	hubd_restore_state_cb
-root    hubd_disconnect_event_cb
-root    hubd_post_resume_event_cb
-root    hubd_pre_suspend_event_cb
-root    hubd_reconnect_event_cb
-root	hubd_hotplug_thread
-root	hubd_reset_thread
-root	hubd_cpr_post_user_callb
-root	hubd_bus_power
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_close
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_reset
-
-add usba_pipe_async_req::callback targets warlock_dummy
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usb_bulk_req::bulk_cb targets warlock_dummy
-add usb_bulk_req::bulk_exc_cb targets warlock_dummy
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-
-add usba_pm_req::cb targets warlock_dummy
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
diff --git a/usr/src/uts/common/io/warlock/usb_ia.wlcmd b/usr/src/uts/common/io/warlock/usb_ia.wlcmd
deleted file mode 100644
index c0c370f9bb..0000000000
--- a/usr/src/uts/common/io/warlock/usb_ia.wlcmd
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-one usb_ia
-one usba_device
-
-### currently unused functions
-root usb_ia_event_cb
-root usb_ia_power
-root usb_ia_bus_ctl
diff --git a/usr/src/uts/common/io/warlock/usb_ia_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usb_ia_with_usba.wlcmd
deleted file mode 100644
index f3d021f48d..0000000000
--- a/usr/src/uts/common/io/warlock/usb_ia_with_usba.wlcmd
+++ /dev/null
@@ -1,179 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usb_ia
-one usba_device
-
-### specify the root functions
-
-root	usba_ascii_string_descr
-root	usb_console_output_init
-root	usb_console_output_fini
-root	usb_console_output_enter
-root	usb_console_output_exit
-root	usb_console_write
-root	usb_console_input_enter
-root	usb_console_input_exit
-root	usb_console_input_fini
-root	usb_console_input_init
-root	usb_console_read
-root	hubd_hotplug_thread
-root	hubd_reset_thread
-root	hubd_cpr_post_user_callb
-root	usb_get_dev_descr
-root	usb_get_if_number
-root	usb_parse_CV_cfg_descr
-root	usb_parse_CV_ep_descr
-root	usb_parse_CV_if_descr
-root    usb_parse_comp_ep_descr
-root	usb_pipe_reset
-root	usb_pipe_get_private
-root	usb_get_current_frame_number
-root	usb_get_max_isoc_pkts
-root	usb_pipe_set_private
-root	usba_ready_interface_node
-root	usba_free_hcdi_ops
-root	ohci_intr
-root	ehci_intr
-
-root    usba_dbuf_tail
-root	usb_log
-root	usb_ia_event_cb
-root	hubd_bus_power
-root	usba_hubdi_power
-root	usba_hubdi_root_hub_power
-root	usba_hubdi_bus_ctl
-root	usb_set_device_pwrlvl0
-root	usb_set_device_pwrlvl1
-root	usb_set_device_pwrlvl2
-root	usb_set_device_pwrlvl3
-root	usba_async_req_raise_power
-root	usba_async_req_lower_power
-root	usb_req_raise_power
-root	usb_req_lower_power
-root	usb_is_pm_enabled
-root	usb_pipe_bulk_transfer_size
-root	usba_get_hotplug_stats
-root	usba_reset_hotplug_stats
-root	usb_async_req
-root	usb_get_ep_data
-root	usba_pipe_get_policy
-root	usb_pipe_ctrl_xfer_wait
-root	usb_get_current_cfgidx
-
-root	usb_alloc_bulk_req
-root	usb_clear_feature
-root	usb_free_bulk_req 
-root	usb_get_alt_if
-root	usb_get_ep_descr 
-root	usb_get_if_descr 
-root	usb_pipe_bulk_xfer 
-root	usb_pipe_isoc_xfer
-root	usb_pipe_stop_isoc_polling
-root	usb_set_alt_if
-root	usb_set_cfg 
-root	usb_get_cfg 
-root	usb_get_status
-root	usb_ep_num
-root	usb_register_event_cbs
-root    usb_unregister_event_cbs
-root    usb_log_descr_tree
-root    usb_print_descr_tree
-root	usb_pipe_drain_reqs
-root	usb_try_serialize_access
-root    usb_fini_serialization
-root    usb_init_serialization
-root    usb_release_access
-root    usb_serialize_access
-root    usb_rval2errno
-root	usb_clr_feature
-root	usb_get_ep_data
-root	usb_register_hotplug_cbs
-root    usb_register_client
-root	usb_reset_device
-root	usb_ugen_power
-root	usb_ugen_attach
-root	usb_ugen_close
-root	usb_ugen_detach
-root	usb_ugen_disconnect_ev_cb
-root	usb_ugen_get_hdl
-root	usb_ugen_open
-root	usb_ugen_poll
-root	usb_ugen_read
-root	usb_ugen_reconnect_ev_cb
-root	usb_ugen_write
-root	usba_ready_interface_association_node
-root	usb_register_dev_driver
-root	usb_unregister_dev_driver
-
-root    hubd_root_hub_cleanup_thread
-root	hubd_restore_state_cb
-root    hubd_disconnect_event_cb
-root    hubd_post_resume_event_cb
-root    hubd_pre_suspend_event_cb
-root    hubd_reconnect_event_cb
-
-
-root	hcdi_autoclearing
-root	hcdi_cb_thread
-root    hcdi_shared_cb_thread
-
-root	ohci_quiesce
-root	uhci_quiesce
-root	ehci_quiesce
-
-root	usba_pipe_do_async_func_thread
-root	usba_get_hc_dma_attr
-root	usba_hcdi_get_req_private 
-root	usba_hcdi_set_req_private
-root	usba_move_list
-root    usba_taskq_destroy
-root	usba_mk_mctl
-root	usb_fail_checkpoint
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usb_bulk_req::bulk_cb	targets warlock_dummy
-add usb_bulk_req::bulk_exc_cb	targets warlock_dummy
-add usb_ctrl_req::ctrl_cb	targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb	targets warlock_dummy
-add usb_isoc_req::isoc_cb	targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb	targets warlock_dummy
-add usba_pipe_async_req::sync_func	targets warlock_dummy
-
-add usba_pm_req::cb 		targets warlock_dummy
-
-add usba_pipe_async_req::callback targets warlock_dummy
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
diff --git a/usr/src/uts/common/io/warlock/usb_mid.wlcmd b/usr/src/uts/common/io/warlock/usb_mid.wlcmd
deleted file mode 100644
index 2dc9145a4c..0000000000
--- a/usr/src/uts/common/io/warlock/usb_mid.wlcmd
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-one usb_mid
-one usba_device
-
-### currently unused functions
-root usb_mid_event_cb
-root usb_mid_power
-root usb_mid_bus_ctl
diff --git a/usr/src/uts/common/io/warlock/usb_mid_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usb_mid_with_usba.wlcmd
deleted file mode 100644
index 0bd5a56a05..0000000000
--- a/usr/src/uts/common/io/warlock/usb_mid_with_usba.wlcmd
+++ /dev/null
@@ -1,168 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usb_mid
-one usba_device
-
-### specify the root functions
-
-root	usba_ascii_string_descr
-root	usb_console_output_init
-root	usb_console_output_fini
-root	usb_console_output_enter
-root	usb_console_output_exit
-root	usb_console_write
-root	usb_console_input_enter
-root	usb_console_input_exit
-root	usb_console_input_fini
-root	usb_console_input_init
-root	usb_console_read
-root	hubd_hotplug_thread
-root	hubd_reset_thread
-root	hubd_cpr_post_user_callb
-root	usb_get_dev_descr
-root	usb_get_if_number
-root	usb_parse_CV_cfg_descr
-root	usb_parse_CV_ep_descr
-root	usb_parse_CV_if_descr
-root	usb_parse_comp_ep_descr
-root	usb_pipe_reset
-root	usb_pipe_get_private
-root	usb_get_current_frame_number
-root	usb_get_max_isoc_pkts
-root	usb_pipe_set_private
-root	usba_ready_interface_node
-root	usba_free_hcdi_ops
-root	ohci_intr
-root	ehci_intr
-root    ohci_quiesce
-root    uhci_quiesce
-root    ehci_quiesce
-
-root    usba_dbuf_tail
-root	usb_log
-root	usb_mid_event_cb
-root	hubd_bus_power
-root	usba_hubdi_power
-root	usba_hubdi_root_hub_power
-root	usba_hubdi_bus_ctl
-root	usb_set_device_pwrlvl0
-root	usb_set_device_pwrlvl1
-root	usb_set_device_pwrlvl2
-root	usb_set_device_pwrlvl3
-root	usba_async_req_raise_power
-root	usba_async_req_lower_power
-root	usb_req_raise_power
-root	usb_req_lower_power
-root	usb_is_pm_enabled
-root	usb_pipe_bulk_transfer_size
-root	usba_get_hotplug_stats
-root	usba_reset_hotplug_stats
-root	usb_async_req
-root	usb_get_ep_data
-root	usba_pipe_get_policy
-root	usb_pipe_ctrl_xfer_wait
-root	usb_get_current_cfgidx
-
-root	usb_alloc_bulk_req
-root	usb_clear_feature
-root	usb_free_bulk_req 
-root	usb_get_alt_if
-root	usb_get_ep_descr 
-root	usb_get_if_descr 
-root	usb_pipe_bulk_xfer 
-root	usb_pipe_isoc_xfer
-root	usb_pipe_stop_isoc_polling
-root	usb_set_alt_if
-root	usb_set_cfg 
-root	usb_get_cfg 
-root	usb_get_status
-root	usb_ep_num
-root	usb_register_event_cbs
-root    usb_unregister_event_cbs
-root    usb_log_descr_tree
-root    usb_print_descr_tree
-root	usb_pipe_drain_reqs
-root	usb_try_serialize_access
-root    usb_fini_serialization
-root    usb_init_serialization
-root    usb_release_access
-root    usb_serialize_access
-root    usb_rval2errno
-root	usb_clr_feature
-root	usb_get_ep_data
-root	usb_register_hotplug_cbs
-root    usb_register_client
-root	usb_reset_device
-root	usb_ugen_power
-root	usb_register_dev_driver
-root	usb_unregister_dev_driver
-
-root    hubd_root_hub_cleanup_thread
-root	hubd_restore_state_cb
-root    hubd_disconnect_event_cb
-root    hubd_post_resume_event_cb
-root    hubd_pre_suspend_event_cb
-root    hubd_reconnect_event_cb
-
-
-root	hcdi_autoclearing
-root	hcdi_cb_thread
-root    hcdi_shared_cb_thread
-
-
-root	usba_pipe_do_async_func_thread
-root	usba_get_hc_dma_attr
-root	usba_hcdi_get_req_private 
-root	usba_hcdi_set_req_private
-root	usba_move_list
-root    usba_taskq_destroy
-root	usba_mk_mctl
-root	usb_fail_checkpoint
-
-add hubd::h_cleanup_child	targets warlock_dummy
-add usb_bulk_req::bulk_cb	targets warlock_dummy
-add usb_bulk_req::bulk_exc_cb	targets warlock_dummy
-add usb_ctrl_req::ctrl_cb	targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb	targets warlock_dummy
-add usb_isoc_req::isoc_cb	targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb	targets warlock_dummy
-add usba_pipe_async_req::sync_func	targets warlock_dummy
-
-add usba_pm_req::cb 		targets warlock_dummy
-
-add usba_pipe_async_req::callback targets warlock_dummy
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
diff --git a/usr/src/uts/common/io/warlock/usbecm.wlcmd b/usr/src/uts/common/io/warlock/usbecm.wlcmd
deleted file mode 100644
index 1dfceeca69..0000000000
--- a/usr/src/uts/common/io/warlock/usbecm.wlcmd
+++ /dev/null
@@ -1,72 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-one usbecm_state
-
-### specify the root functions
-
-root usbecm_bulkin_cb
-root usbecm_bulkout_cb
-root usbecm_intr_cb
-root usbecm_intr_ex_cb
-
-### specify usbecm function pointers
-
-
-root usbecm_bulkin_cb
-root usbecm_bulkout_cb
-root usbecm_intr_cb
-root usbecm_intr_ex_cb
-
-# temporary
-root usbecm_pm_set_busy
-root usbecm_pm_set_idle
-root usbecm_power
-
-root usbecm_m_stop
-root usbecm_m_start
-root usbecm_m_unicst
-root usbecm_m_multicst
-root usbecm_m_promisc
-root usbecm_m_ioctl
-root usbecm_m_tx
-root usbecm_m_getprop
-root usbecm_m_setprop
-root usbecm_m_stat
-
-root usbecm_disconnect_event_cb
-root usbecm_reconnect_event_cb
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
-
-add usbecm_ds_ops::ecm_ds_init targets warlock_dummy
-add usbecm_ds_ops::ecm_ds_fini targets warlock_dummy
-add usbecm_ds_ops::ecm_ds_start targets warlock_dummy
-add usbecm_ds_ops::ecm_ds_stop targets warlock_dummy
-add usbecm_ds_ops::ecm_ds_intr_cb targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usbecm_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usbecm_with_usba.wlcmd
deleted file mode 100644
index db55073262..0000000000
--- a/usr/src/uts/common/io/warlock/usbecm_with_usba.wlcmd
+++ /dev/null
@@ -1,187 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usbecm_state
-
-### specify the root functions
-
-root	usb_console_output_init
-root	usb_console_output_fini
-root	usb_console_output_enter
-root	usb_console_output_exit
-root	usb_console_write
-root	usb_console_input_enter
-root	usb_console_input_exit
-root	usb_console_input_fini
-root	usb_console_input_init
-root	usb_console_read
-root	usb_get_dev_descr
-root	usb_get_if_number
-root	usb_parse_CV_cfg_descr
-root	usb_parse_CV_ep_descr
-root	usb_parse_CV_if_descr
-root    usb_parse_comp_ep_descr
-root	usb_pipe_get_private
-root	usb_get_current_frame_number
-root	usb_get_max_isoc_pkts
-root	usb_pipe_set_private
-root	usba_ready_interface_node
-root	usba_free_hcdi_ops
-root	usba_async_req_raise_power
-root	usba_async_req_lower_power
-root	usb_req_raise_power
-root	usb_req_lower_power
-root	usb_set_device_pwrlvl0
-root	usb_set_device_pwrlvl1
-root	usb_set_device_pwrlvl2
-root	usb_set_device_pwrlvl3
-root	usb_is_pm_enabled
-root	usb_async_req
-root	usb_pipe_bulk_transfer_size
-root 	usb_get_ep_data
-root	usba_pipe_get_policy
-root	usb_pipe_ctrl_xfer_wait
-root	usb_pipe_drain_reqs
-root    usb_try_serialize_access
-root	usb_clr_feature
-root    usb_clear_feature
-root    usb_get_alt_if
-root    usb_get_ep_descr
-root    usb_get_if_descr
-root    usb_log
-root    usb_pipe_isoc_xfer
-root    usb_pipe_stop_isoc_polling
-root    usb_set_alt_if
-root    usb_set_cfg
-root    usb_get_cfg
-root	usb_ep_num
-root	usb_get_status
-root	usb_pipe_reset
-root	usb_log_descr_tree
-root	usb_print_descr_tree
-root    usb_rval2errno
-root	usb_register_hotplug_cbs
-root	usb_get_current_cfgidx
-root    usb_register_client
-root	usb_reset_device
-root	usb_ugen_power
-root	usb_ugen_attach
-root	usb_ugen_close
-root	usb_ugen_detach
-root	usb_ugen_disconnect_ev_cb
-root	usb_ugen_get_hdl
-root	usb_ugen_open
-root	usb_ugen_poll
-root	usb_ugen_read
-root	usb_ugen_reconnect_ev_cb
-root	usb_ugen_write
-root	usb_register_dev_driver
-root	usb_unregister_dev_driver
-
-root	hcdi_autoclearing
-root	hcdi_cb_thread
-root    hcdi_shared_cb_thread
-
-
-root	hubd_restore_state_cb
-root    hubd_disconnect_event_cb
-root    hubd_post_resume_event_cb
-root    hubd_pre_suspend_event_cb
-root    hubd_reconnect_event_cb
-root	hubd_hotplug_thread
-root	hubd_reset_thread
-root	hubd_cpr_post_user_callb
-root    hubd_root_hub_cleanup_thread
-root	hubd_bus_power
-
-root	usba_common_power
-root	usba_common_register_events
-root	usba_ready_interface_association_node
-root	usba_pipe_do_async_func_thread
-root	usba_pipe_sync_reset
-root    usba_get_hc_dma_attr
-root    usba_hcdi_get_req_private
-root    usba_hcdi_set_req_private
-root    usba_dbuf_tail
-root	usba_hubdi_power
-root	usba_hubdi_root_hub_power
-root	usba_get_hotplug_stats
-root	usba_reset_hotplug_stats
-root	usba_ascii_string_descr
-root	usba_move_list
-root    usba_taskq_destroy
-root	usba_mk_mctl
-root	usb_fail_checkpoint
-
-root	ohci_intr
-root	ehci_intr
-root    ohci_quiesce
-root    uhci_quiesce
-root    ehci_quiesce
-
-### specify the usbecm root functions
-root usbecm_power
-root usbecm_disconnect_event_cb
-root usbecm_reconnect_event_cb
-
-root	usbecm_m_stop
-root	usbecm_m_start
-root	usbecm_m_stat
-root	usbecm_m_promisc
-root	usbecm_m_multicst
-root	usbecm_m_unicst
-root	usbecm_m_tx
-root	usbecm_m_ioctl
-root	usbecm_m_getprop
-root	usbecm_m_setprop
-
-# temporary
-root	usbecm_pm_set_busy
-root	usbecm_pm_set_idle
-
-add hubd::h_cleanup_child	targets warlock_dummy
-add usb_ctrl_req::ctrl_cb	targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb	targets warlock_dummy
-add usba_pipe_async_req::callback	targets warlock_dummy
-add usba_pipe_async_req::sync_func	targets warlock_dummy
-add usba_pm_req::cb			targets warlock_dummy
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
-
-add usbecm_ds_ops::ecm_ds_init targets warlock_dummy
-add usbecm_ds_ops::ecm_ds_fini targets warlock_dummy
-add usbecm_ds_ops::ecm_ds_start targets warlock_dummy
-add usbecm_ds_ops::ecm_ds_stop targets warlock_dummy
-add usbecm_ds_ops::ecm_ds_intr_cb targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usbftdi.wlcmd b/usr/src/uts/common/io/warlock/usbftdi.wlcmd
deleted file mode 100644
index 08c948b31e..0000000000
--- a/usr/src/uts/common/io/warlock/usbftdi.wlcmd
+++ /dev/null
@@ -1,91 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-one usbser_state
-one uftdi_state
-
-### specify the root functions
-
-root usbser_first_device
-root usbser_putchar
-root usbser_getchar
-root usbser_ischar
-root usbser_polledio_enter
-root usbser_polledio_exit
-root usbser_soft_state_size
-root usbser_uftdi_open
-root usbser_close
-root usbser_wput
-root usbser_wsrv
-root usbser_rsrv
-root usbser_tx_cb
-root usbser_rx_cb
-root usbser_status_cb
-root usbser_wq_thread
-root usbser_rq_thread
-root usbser_disconnect_cb
-root usbser_reconnect_cb
-root usbser_cpr_suspend
-root usbser_cpr_resume
-
-root uftdi_bulkin_cb
-root uftdi_bulkout_cb
-
-### specify uftdi function pointers
-
-add ds_ops::ds_attach targets uftdi_attach
-add ds_ops::ds_detach targets uftdi_detach
-add ds_ops::ds_register_cb targets uftdi_register_cb
-add ds_ops::ds_unregister_cb targets uftdi_unregister_cb
-add ds_ops::ds_open_port targets uftdi_open_port
-add ds_ops::ds_close_port targets uftdi_close_port
-add ds_ops::ds_usb_power targets uftdi_usb_power
-add ds_ops::ds_suspend targets uftdi_suspend
-add ds_ops::ds_resume targets uftdi_resume
-add ds_ops::ds_disconnect targets uftdi_disconnect
-add ds_ops::ds_reconnect targets uftdi_reconnect
-add ds_ops::ds_set_port_params targets uftdi_set_port_params
-add ds_ops::ds_set_modem_ctl targets uftdi_set_modem_ctl
-add ds_ops::ds_get_modem_ctl targets uftdi_get_modem_ctl
-add ds_ops::ds_break_ctl targets uftdi_break_ctl
-add ds_ops::ds_tx targets uftdi_tx
-add ds_ops::ds_rx targets uftdi_rx
-add ds_ops::ds_stop targets uftdi_stop
-add ds_ops::ds_start targets uftdi_start
-add ds_ops::ds_fifo_flush targets uftdi_fifo_flush
-add ds_ops::ds_fifo_drain targets uftdi_fifo_drain
-add ds_ops::ds_out_pipe targets uftdi_out_pipe
-add ds_ops::ds_in_pipe targets uftdi_in_pipe
-
-add uftdi_state::uf_cb.cb_tx targets usbser_tx_cb
-add uftdi_state::uf_cb.cb_rx targets usbser_rx_cb
-add uftdi_state::uf_cb.cb_status targets usbser_status_cb
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usbftdi_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usbftdi_with_usba.wlcmd
deleted file mode 100644
index 2f6d1a7d3c..0000000000
--- a/usr/src/uts/common/io/warlock/usbftdi_with_usba.wlcmd
+++ /dev/null
@@ -1,225 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usbser_state
-one uftdi_state
-
-### specify the root functions
-
-root usbser_first_device
-root usbser_putchar
-root usbser_getchar
-root usbser_ischar
-root usbser_polledio_enter
-root usbser_polledio_exit
-root usb_console_output_fini
-root usb_console_input_enter
-root usb_console_input_exit
-root usb_console_input_fini
-root usb_console_input_init
-root usb_console_read
-root usb_get_dev_descr
-root usb_get_if_number
-root usb_parse_CV_cfg_descr
-root usb_parse_CV_ep_descr
-root usb_parse_CV_if_descr
-root usb_parse_comp_ep_descr
-root usb_pipe_get_private
-root usb_get_current_frame_number
-root usb_get_max_isoc_pkts
-root usb_pipe_set_private
-root usba_ready_interface_node
-root usba_free_hcdi_ops
-root usba_async_req_raise_power
-root usba_async_req_lower_power
-root usb_req_raise_power
-root usb_req_lower_power
-root usb_set_device_pwrlvl0
-root usb_set_device_pwrlvl1
-root usb_set_device_pwrlvl2
-root usb_set_device_pwrlvl3
-root usb_is_pm_enabled
-root usb_async_req
-root usb_pipe_bulk_transfer_size
-root usb_get_ep_data
-root usba_pipe_get_policy
-root usb_pipe_ctrl_xfer_wait
-root usb_pipe_drain_reqs
-root usb_try_serialize_access
-root usb_fini_serialization
-root usb_init_serialization
-root usb_release_access
-root usb_serialize_access
-root usb_clr_feature
-root usb_clear_feature
-root usb_get_alt_if
-root usb_get_ep_descr
-root usb_get_if_descr
-root usb_log
-root usb_pipe_isoc_xfer
-root usb_pipe_stop_isoc_polling
-root usb_set_alt_if
-root usb_set_cfg
-root usb_get_cfg
-root usb_ep_num
-root usb_get_status
-root usb_pipe_reset
-root usb_log_descr_tree
-root usb_print_descr_tree
-root usb_rval2errno
-root usb_register_hotplug_cbs
-root usb_get_current_cfgidx
-root usb_register_client
-root usb_reset_device
-root usb_register_dev_driver
-root usb_unregister_dev_driver
-
-root usb_ugen_attach
-root usb_ugen_close
-root usb_ugen_detach
-root usb_ugen_disconnect_ev_cb
-root usb_ugen_get_hdl
-root usb_ugen_open
-root usb_ugen_poll
-root usb_ugen_power
-root usb_ugen_read
-root usb_ugen_reconnect_ev_cb
-root usb_ugen_write
-
-root hcdi_autoclearing
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-
-root hubd_restore_state_cb
-root hubd_disconnect_event_cb
-root hubd_post_resume_event_cb
-root hubd_pre_suspend_event_cb
-root hubd_reconnect_event_cb
-root hubd_hotplug_thread
-root hubd_reset_thread
-root hubd_cpr_post_user_callb
-root hubd_root_hub_cleanup_thread
-root hubd_bus_power
-
-root usba_common_power
-root usba_common_register_events
-root usba_ready_interface_association_node
-root usba_pipe_do_async_func_thread
-root usba_pipe_sync_reset
-root usba_get_hc_dma_attr
-root usba_hcdi_get_req_private
-root usba_hcdi_set_req_private
-root usba_dbuf_tail
-root usba_hubdi_power
-root usba_hubdi_root_hub_power
-root usba_get_hotplug_stats
-root usba_reset_hotplug_stats
-root usba_ascii_string_descr
-root usba_move_list
-root usba_taskq_destroy
-root usba_mk_mctl
-root usb_fail_checkpoint
-
-root ohci_intr
-root ehci_intr
-root ohci_quiesce
-root uhci_quiesce
-root ehci_quiesce
-
-### specify the uftdi root functions
-
-root usbser_soft_state_size
-root usbser_uftdi_open
-root usbser_close
-root usbser_wput
-root usbser_wsrv
-root usbser_rsrv
-root usbser_tx_cb
-root usbser_rx_cb
-root usbser_status_cb
-root usbser_wq_thread
-root usbser_rq_thread
-root usbser_disconnect_cb
-root usbser_reconnect_cb
-root usbser_cpr_suspend
-root usbser_cpr_resume
-
-root uftdi_bulkin_cb
-root uftdi_bulkout_cb
-
-### specify uftdi function pointers
-
-add ds_ops::ds_attach targets uftdi_attach
-add ds_ops::ds_detach targets uftdi_detach
-add ds_ops::ds_register_cb targets uftdi_register_cb
-add ds_ops::ds_unregister_cb targets uftdi_unregister_cb
-add ds_ops::ds_open_port targets uftdi_open_port
-add ds_ops::ds_close_port targets uftdi_close_port
-add ds_ops::ds_usb_power targets uftdi_usb_power
-add ds_ops::ds_suspend targets uftdi_suspend
-add ds_ops::ds_resume targets uftdi_resume
-add ds_ops::ds_disconnect targets uftdi_disconnect
-add ds_ops::ds_reconnect targets uftdi_reconnect
-add ds_ops::ds_set_port_params targets uftdi_set_port_params
-add ds_ops::ds_set_modem_ctl targets uftdi_set_modem_ctl
-add ds_ops::ds_get_modem_ctl targets uftdi_get_modem_ctl
-add ds_ops::ds_break_ctl targets uftdi_break_ctl
-add ds_ops::ds_tx targets uftdi_tx
-add ds_ops::ds_rx targets uftdi_rx
-add ds_ops::ds_stop targets uftdi_stop
-add ds_ops::ds_start targets uftdi_start
-add ds_ops::ds_fifo_flush targets uftdi_fifo_flush
-add ds_ops::ds_fifo_drain targets uftdi_fifo_drain
-add ds_ops::ds_out_pipe targets uftdi_out_pipe
-add ds_ops::ds_in_pipe targets uftdi_in_pipe
-
-add uftdi_state::uf_cb.cb_tx targets usbser_tx_cb
-add uftdi_state::uf_cb.cb_rx targets usbser_rx_cb
-add uftdi_state::uf_cb.cb_status targets usbser_status_cb
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usb_ctrl_req::ctrl_cb	targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb	targets warlock_dummy
-add usb_bulk_req::bulk_cb	targets uftdi_bulkin_cb
-add usb_bulk_req::bulk_exc_cb	targets uftdi_bulkin_cb
-add usb_bulk_req::bulk_cb	targets uftdi_bulkout_cb
-add usb_bulk_req::bulk_exc_cb	targets uftdi_bulkout_cb
-
-add usb_isoc_req::isoc_cb	targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb	targets warlock_dummy
-add usba_pipe_async_req::callback	targets warlock_dummy
-add usba_pipe_async_req::sync_func	targets warlock_dummy
-add usba_pm_req::cb			targets warlock_dummy
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
diff --git a/usr/src/uts/common/io/warlock/usbprn.wlcmd b/usr/src/uts/common/io/warlock/usbprn.wlcmd
deleted file mode 100644
index 436379fdc5..0000000000
--- a/usr/src/uts/common/io/warlock/usbprn.wlcmd
+++ /dev/null
@@ -1,47 +0,0 @@
-
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-one usbprn_state
-
-### specify the root functions
-
-root usbprn_open
-root usbprn_close 
-root usbprn_ioctl
-root usbprn_bulk_xfer_cb
-root usbprn_bulk_xfer_exc_cb
-root usbprn_reconnect_event_cb
-root usbprn_disconnect_event_cb
-root usbprn_power
-
-add        bus_ops::bus_add_eventcall targets warlock_dummy
-add        bus_ops::bus_get_eventcookie targets warlock_dummy
-add        bus_ops::bus_post_event targets warlock_dummy
-add        bus_ops::bus_remove_eventcall targets warlock_dummy
-add        bus_ops::bus_intr_ctl targets warlock_dummy
-add        bus_ops::bus_config targets warlock_dummy
-add        bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usbprn_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usbprn_with_usba.wlcmd
deleted file mode 100644
index 2469648729..0000000000
--- a/usr/src/uts/common/io/warlock/usbprn_with_usba.wlcmd
+++ /dev/null
@@ -1,165 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usbprn_state
-
-### specify the root functions
-
-root	usb_console_output_init
-root	usb_console_output_fini
-root	usb_console_output_enter
-root	usb_console_output_exit
-root	usb_console_write
-root	usb_console_input_enter
-root	usb_console_input_exit
-root	usb_console_input_fini
-root	usb_console_input_init
-root	usb_console_read
-root	usb_get_dev_descr
-root	usb_get_if_number
-root	usb_parse_CV_cfg_descr
-root	usb_parse_CV_ep_descr
-root	usb_parse_CV_if_descr
-root    usb_parse_comp_ep_descr
-root	usb_pipe_get_private
-root	usb_get_current_frame_number
-root	usb_get_max_isoc_pkts
-root	usb_pipe_set_private
-root	usba_ready_interface_node
-root	usba_free_hcdi_ops
-root	usba_async_req_raise_power
-root	usba_async_req_lower_power
-root	usb_req_raise_power
-root	usb_req_lower_power
-root	usb_set_device_pwrlvl0
-root	usb_set_device_pwrlvl1
-root	usb_set_device_pwrlvl2
-root	usb_set_device_pwrlvl3
-root	usb_is_pm_enabled
-root	usb_async_req
-root	usb_pipe_bulk_transfer_size
-root 	usb_get_ep_data
-root	usba_pipe_get_policy
-root	usb_pipe_ctrl_xfer_wait
-root	usb_pipe_drain_reqs
-root    usb_try_serialize_access
-root	usb_clr_feature
-root    usb_clear_feature
-root    usb_get_alt_if
-root    usb_get_ep_descr
-root    usb_get_if_descr
-root    usb_log
-root    usb_pipe_isoc_xfer
-root    usb_pipe_stop_isoc_polling
-root    usb_set_alt_if
-root    usb_set_cfg
-root    usb_get_cfg
-root	usb_ep_num
-root	usb_get_status
-root	usb_pipe_reset
-root	usb_log_descr_tree
-root	usb_print_descr_tree
-root    usb_rval2errno
-root	usb_register_hotplug_cbs
-root	usb_get_current_cfgidx
-root    usb_register_client
-root	usb_reset_device
-root	usb_ugen_power
-root	usb_register_dev_driver
-root	usb_unregister_dev_driver
-
-root	hcdi_autoclearing
-root	hcdi_cb_thread
-root    hcdi_shared_cb_thread
-
-root    ohci_quiesce
-root    uhci_quiesce
-root    ehci_quiesce
-
-root	hubd_restore_state_cb
-root    hubd_disconnect_event_cb
-root    hubd_post_resume_event_cb
-root    hubd_pre_suspend_event_cb
-root    hubd_reconnect_event_cb
-root	hubd_hotplug_thread
-root	hubd_reset_thread
-root	hubd_cpr_post_user_callb
-root    hubd_root_hub_cleanup_thread
-root	hubd_bus_power
-
-root	usba_common_power
-root	usba_common_register_events
-root	usba_ready_interface_association_node
-root	usba_pipe_do_async_func_thread
-root	usba_pipe_sync_reset
-root    usba_get_hc_dma_attr
-root    usba_hcdi_get_req_private
-root    usba_hcdi_set_req_private
-root    usba_dbuf_tail
-root	usba_hubdi_power
-root	usba_hubdi_root_hub_power
-root	usba_get_hotplug_stats
-root	usba_reset_hotplug_stats
-root	usba_ascii_string_descr
-root	usba_move_list
-root    usba_taskq_destroy
-root	usba_mk_mctl
-root	usb_fail_checkpoint
-
-root	ohci_intr
-root	ehci_intr
-
-### specify the usbprn root functions
-root 	usbprn_open
-root 	usbprn_close
-root 	usbprn_ioctl
-root 	usbprn_bulk_xfer_cb
-root 	usbprn_bulk_xfer_exc_cb
-
-root 	usbprn_reconnect_event_cb
-root 	usbprn_disconnect_event_cb
-root 	usbprn_power
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usb_ctrl_req::ctrl_cb	targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb	targets warlock_dummy
-add usb_bulk_req::bulk_cb	targets usbprn_bulk_xfer_cb
-add usb_bulk_req::bulk_exc_cb	targets usbprn_bulk_xfer_exc_cb
-add usb_isoc_req::isoc_cb	targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb	targets warlock_dummy
-add usba_pipe_async_req::callback	targets warlock_dummy
-add usba_pipe_async_req::sync_func	targets warlock_dummy
-add usba_pm_req::cb			targets warlock_dummy
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
diff --git a/usr/src/uts/common/io/warlock/usbsacm.wlcmd b/usr/src/uts/common/io/warlock/usbsacm.wlcmd
deleted file mode 100644
index 8cebc0de43..0000000000
--- a/usr/src/uts/common/io/warlock/usbsacm.wlcmd
+++ /dev/null
@@ -1,92 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-
-one usbser_state
-one usbsacm_state
-
-### specify the root functions
-
-root usbser_first_device
-root usbser_putchar
-root usbser_getchar
-root usbser_ischar
-root usbser_polledio_enter
-root usbser_polledio_exit
-root usbser_soft_state_size
-root usbsacm_open
-root usbser_close
-root usbser_wput
-root usbser_wsrv
-root usbser_rsrv
-root usbser_tx_cb
-root usbser_rx_cb
-root usbser_status_cb
-root usbser_wq_thread
-root usbser_rq_thread
-root usbser_disconnect_cb
-root usbser_reconnect_cb
-root usbser_cpr_suspend
-root usbser_cpr_resume
-
-root usbsacm_bulkin_cb
-root usbsacm_bulkout_cb
-root usbsacm_intr_cb
-root usbsacm_intr_ex_cb
-
-### specify usbsacm function pointers
-
-add ds_ops::ds_attach targets usbsacm_ds_attach
-add ds_ops::ds_detach targets usbsacm_ds_detach
-add ds_ops::ds_register_cb targets usbsacm_ds_register_cb
-add ds_ops::ds_unregister_cb targets usbsacm_ds_unregister_cb
-add ds_ops::ds_open_port targets usbsacm_ds_open_port
-add ds_ops::ds_close_port targets usbsacm_ds_close_port
-add ds_ops::ds_usb_power targets usbsacm_ds_usb_power
-add ds_ops::ds_suspend targets usbsacm_ds_suspend
-add ds_ops::ds_resume targets usbsacm_ds_resume
-add ds_ops::ds_disconnect targets usbsacm_ds_disconnect
-add ds_ops::ds_reconnect targets usbsacm_ds_reconnect
-add ds_ops::ds_set_port_params targets usbsacm_ds_set_port_params
-add ds_ops::ds_set_modem_ctl targets usbsacm_ds_set_modem_ctl
-add ds_ops::ds_get_modem_ctl targets usbsacm_ds_get_modem_ctl
-add ds_ops::ds_break_ctl targets usbsacm_ds_break_ctl
-add ds_ops::ds_tx targets usbsacm_ds_tx
-add ds_ops::ds_rx targets usbsacm_ds_rx
-add ds_ops::ds_stop targets usbsacm_ds_stop
-add ds_ops::ds_start targets usbsacm_ds_start
-add ds_ops::ds_fifo_flush targets usbsacm_ds_fifo_flush
-add ds_ops::ds_fifo_drain targets usbsacm_ds_fifo_drain
-add ds_ops::ds_in_pipe targets warlock_dummy
-add ds_ops::ds_out_pipe targets warlock_dummy
-
-add usbsacm_port::acm_cb.cb_tx targets usbser_tx_cb
-add usbsacm_port::acm_cb.cb_rx targets usbser_rx_cb
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usbsacm_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usbsacm_with_usba.wlcmd
deleted file mode 100644
index 98ba44d89d..0000000000
--- a/usr/src/uts/common/io/warlock/usbsacm_with_usba.wlcmd
+++ /dev/null
@@ -1,220 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usbser_state
-one usbsacm_state
-one usbsacm_port
-
-### specify the root functions
-
-root usba_common_power
-root usba_common_register_events
-root usba_ready_interface_association_node
-
-root usbser_first_device
-root usbser_putchar
-root usbser_getchar
-root usbser_ischar
-root usbser_polledio_enter
-root usbser_polledio_exit
-root usb_console_output_fini
-root usb_console_input_enter
-root usb_console_input_exit
-root usb_console_input_fini
-root usb_console_input_init
-root usb_console_read
-root usb_get_dev_descr
-root usb_get_if_number
-root usb_parse_CV_cfg_descr
-root usb_parse_CV_ep_descr
-root usb_parse_CV_if_descr
-root usb_pipe_get_private
-root usb_get_current_frame_number
-root usb_get_max_isoc_pkts
-root usb_pipe_set_private
-root usba_ready_interface_node
-root usba_free_hcdi_ops
-root usba_async_req_raise_power
-root usba_async_req_lower_power
-root usb_req_raise_power
-root usb_req_lower_power
-root usb_set_device_pwrlvl0
-root usb_set_device_pwrlvl1
-root usb_set_device_pwrlvl2
-root usb_set_device_pwrlvl3
-root usb_is_pm_enabled
-root usb_async_req
-root usb_pipe_bulk_transfer_size
-root usb_get_ep_data
-root usba_pipe_get_policy
-root usb_pipe_ctrl_xfer_wait
-root usb_pipe_drain_reqs
-root usb_try_serialize_access
-root usb_fini_serialization
-root usb_init_serialization
-root usb_release_access
-root usb_serialize_access
-root usb_clr_feature
-root usb_clear_feature
-root usb_get_alt_if
-root usb_get_ep_descr
-root usb_get_if_descr
-root usb_log
-root usb_pipe_isoc_xfer
-root usb_pipe_stop_isoc_polling
-root usb_set_alt_if
-root usb_set_cfg
-root usb_get_cfg
-root usb_ep_num
-root usb_get_status
-root usb_pipe_reset
-root usb_log_descr_tree
-root usb_print_descr_tree
-root usb_rval2errno
-root usb_register_hotplug_cbs
-root usb_get_current_cfgidx
-root usb_register_client
-root usb_reset_device
-root usb_register_dev_driver
-root usb_unregister_dev_driver
-
-root usb_ugen_attach
-root usb_ugen_close
-root usb_ugen_detach
-root usb_ugen_disconnect_ev_cb
-root usb_ugen_get_hdl
-root usb_ugen_open
-root usb_ugen_poll
-root usb_ugen_power
-root usb_ugen_read
-root usb_ugen_reconnect_ev_cb
-root usb_ugen_write
-
-root hcdi_autoclearing
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-
-root hubd_restore_state_cb
-root hubd_disconnect_event_cb
-root hubd_post_resume_event_cb
-root hubd_pre_suspend_event_cb
-root hubd_reconnect_event_cb
-root hubd_hotplug_thread
-root hubd_reset_thread
-root hubd_cpr_post_user_callb
-root hubd_root_hub_cleanup_thread
-root hubd_bus_power
-
-root usba_pipe_do_async_func_thread
-root usba_pipe_sync_reset
-root usba_get_hc_dma_attr
-root usba_hcdi_get_req_private
-root usba_hcdi_set_req_private
-root usba_dbuf_tail
-root usba_hubdi_power
-root usba_hubdi_root_hub_power
-root usba_get_hotplug_stats
-root usba_reset_hotplug_stats
-root usba_ascii_string_descr
-root usba_move_list
-root usba_taskq_destroy
-root usba_mk_mctl
-root usb_fail_checkpoint
-
-root ohci_intr
-root ehci_intr
-
-### specify the usbsacm root functions
-
-root usbser_soft_state_size
-root usbsacm_open
-root usbser_close
-root usbser_wput
-root usbser_wsrv
-root usbser_rsrv
-root usbser_tx_cb
-root usbser_rx_cb
-root usbser_status_cb
-root usbser_wq_thread
-root usbser_rq_thread
-root usbser_disconnect_cb
-root usbser_reconnect_cb
-root usbser_cpr_suspend
-root usbser_cpr_resume
-
-root usbsacm_bulkin_cb
-root usbsacm_bulkout_cb
-
-### specify usbsacm function pointers
-
-add ds_ops::ds_attach targets usbsacm_ds_attach
-add ds_ops::ds_detach targets usbsacm_ds_detach
-add ds_ops::ds_register_cb targets usbsacm_ds_register_cb
-add ds_ops::ds_unregister_cb targets usbsacm_ds_unregister_cb
-add ds_ops::ds_open_port targets usbsacm_ds_open_port
-add ds_ops::ds_close_port targets usbsacm_ds_close_port
-add ds_ops::ds_usb_power targets usbsacm_ds_usb_power
-add ds_ops::ds_suspend targets usbsacm_ds_suspend
-add ds_ops::ds_resume targets usbsacm_ds_resume
-add ds_ops::ds_disconnect targets usbsacm_ds_disconnect
-add ds_ops::ds_reconnect targets usbsacm_ds_reconnect
-add ds_ops::ds_set_port_params targets usbsacm_ds_set_port_params
-add ds_ops::ds_set_modem_ctl targets usbsacm_ds_set_modem_ctl
-add ds_ops::ds_get_modem_ctl targets usbsacm_ds_get_modem_ctl
-add ds_ops::ds_break_ctl targets usbsacm_ds_break_ctl
-add ds_ops::ds_tx targets usbsacm_ds_tx
-add ds_ops::ds_rx targets usbsacm_ds_rx
-add ds_ops::ds_stop targets usbsacm_ds_stop
-add ds_ops::ds_start targets usbsacm_ds_start
-add ds_ops::ds_fifo_flush targets usbsacm_ds_fifo_flush
-add ds_ops::ds_fifo_drain targets usbsacm_ds_fifo_drain
-add ds_ops::ds_out_pipe targets warlock_dummy
-add ds_ops::ds_in_pipe targets warlock_dummy
-
-add usbsacm_port::acm_cb.cb_tx targets usbser_tx_cb
-add usbsacm_port::acm_cb.cb_rx targets usbser_rx_cb
-
-add usb_ctrl_req::ctrl_cb	targets usbsacm_intr_cb
-add usb_ctrl_req::ctrl_exc_cb	targets usbsacm_intr_ex_cb
-add usb_bulk_req::bulk_cb	targets usbsacm_bulkin_cb
-add usb_bulk_req::bulk_exc_cb	targets usbsacm_bulkin_cb
-add usb_bulk_req::bulk_cb	targets usbsacm_bulkout_cb
-add usb_bulk_req::bulk_exc_cb	targets usbsacm_bulkout_cb
-
-add usb_isoc_req::isoc_cb	targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb	targets warlock_dummy
-add usba_pipe_async_req::callback	targets warlock_dummy
-add usba_pipe_async_req::sync_func	targets warlock_dummy
-add usba_pm_req::cb			targets warlock_dummy
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
diff --git a/usr/src/uts/common/io/warlock/usbser.wlcmd b/usr/src/uts/common/io/warlock/usbser.wlcmd
deleted file mode 100644
index fe2afe0615..0000000000
--- a/usr/src/uts/common/io/warlock/usbser.wlcmd
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-one usbser_state
-
-### specify the root functions
-
-root usbser_first_device
-root usbser_putchar
-root usbser_getchar
-root usbser_ischar
-root usbser_polledio_enter
-root usbser_polledio_exit
-root usbser_soft_state_size
-root usbser_open
-root usbser_close
-root usbser_wput
-root usbser_wsrv
-root usbser_rsrv
-root usbser_tx_cb
-root usbser_rx_cb
-root usbser_status_cb
-root usbser_wq_thread
-root usbser_rq_thread
-root usbser_disconnect_cb
-root usbser_reconnect_cb
-root usbser_cpr_suspend
-root usbser_cpr_resume
-
-add        dev_ops::devo_attach targets usbser_attach
-add        dev_ops::devo_detach targets usbser_detach
-add        dev_ops::devo_getinfo targets usbser_getinfo
-add        dev_ops::devo_power targets usbser_power
-
-add        ds_ops::ds_attach targets warlock_dummy
-add        ds_ops::ds_detach targets warlock_dummy
-add        ds_ops::ds_register_cb targets warlock_dummy
-add        ds_ops::ds_unregister_cb targets warlock_dummy
-add        ds_ops::ds_open_port targets warlock_dummy
-add        ds_ops::ds_close_port targets warlock_dummy
-add        ds_ops::ds_usb_power targets warlock_dummy
-add        ds_ops::ds_suspend targets warlock_dummy
-add        ds_ops::ds_resume targets warlock_dummy
-add        ds_ops::ds_disconnect targets warlock_dummy
-add        ds_ops::ds_reconnect targets warlock_dummy
-add        ds_ops::ds_set_port_params targets warlock_dummy
-add        ds_ops::ds_set_modem_ctl targets warlock_dummy
-add        ds_ops::ds_get_modem_ctl targets warlock_dummy
-add        ds_ops::ds_break_ctl targets warlock_dummy
-add        ds_ops::ds_loopback targets warlock_dummy
-add        ds_ops::ds_tx targets warlock_dummy
-add        ds_ops::ds_rx targets warlock_dummy
-add        ds_ops::ds_stop targets warlock_dummy
-add        ds_ops::ds_start targets warlock_dummy
-add        ds_ops::ds_fifo_flush targets warlock_dummy
-add        ds_ops::ds_fifo_drain targets warlock_dummy
-add        ds_ops::ds_out_pipe targets warlock_dummy
-add        ds_ops::ds_in_pipe targets warlock_dummy
-
-add        rseq_step::s_func targets usbser_free_soft_state
-add        rseq_step::s_func targets usbser_init_soft_state
-add        rseq_step::s_func targets usbser_fini_soft_state
-add        rseq_step::s_func targets usbser_attach_dev
-add        rseq_step::s_func targets usbser_detach_dev
-add        rseq_step::s_func targets usbser_attach_ports
-add        rseq_step::s_func targets usbser_detach_ports
-add        rseq_step::s_func targets usbser_create_taskq
-add        rseq_step::s_func targets usbser_destroy_taskq
-
-add        bus_ops::bus_add_eventcall targets warlock_dummy
-add        bus_ops::bus_get_eventcookie targets warlock_dummy
-add        bus_ops::bus_post_event targets warlock_dummy
-add        bus_ops::bus_remove_eventcall targets warlock_dummy
-add        bus_ops::bus_intr_ctl targets warlock_dummy
-add        bus_ops::bus_config targets warlock_dummy
-add        bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usbser_edge.wlcmd b/usr/src/uts/common/io/warlock/usbser_edge.wlcmd
deleted file mode 100644
index fb665af683..0000000000
--- a/usr/src/uts/common/io/warlock/usbser_edge.wlcmd
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-one usbser_state
-one edge_pipe
-one edge_state
-one edge_port
-
-### specify the root functions
-
-root usbser_first_device
-root usbser_putchar
-root usbser_getchar
-root usbser_ischar
-root usbser_polledio_enter
-root usbser_polledio_exit
-root usbser_soft_state_size
-root usbser_edge_open
-root usbser_close
-root usbser_wput
-root usbser_wsrv
-root usbser_rsrv
-root usbser_tx_cb
-root usbser_rx_cb
-root usbser_status_cb
-root usbser_wq_thread
-root usbser_rq_thread
-root usbser_disconnect_cb
-root usbser_reconnect_cb
-root usbser_cpr_suspend
-root usbser_cpr_resume
-
-root edgesp_bulkin_cb
-root edgesp_bulkout_cb
-root edgesp_intr_cb
-root edgesp_intr_ex_cb
-
-root edgeti_bulkin_cb
-root edgeti_bulkout_cb
-root edgeti_intr_cb
-root edgeti_intr_ex_cb
-
-### specify edgeport function pointers
-
-add        ds_ops::ds_attach targets edge_attach
-add        ds_ops::ds_detach targets edge_detach
-add        ds_ops::ds_register_cb targets edge_register_cb
-add        ds_ops::ds_unregister_cb targets edge_unregister_cb
-add        ds_ops::ds_open_port targets edge_open_port
-add        ds_ops::ds_close_port targets edge_close_port
-add        ds_ops::ds_usb_power targets edge_usb_power
-add        ds_ops::ds_suspend targets edge_suspend
-add        ds_ops::ds_resume targets edge_resume
-add        ds_ops::ds_disconnect targets edge_disconnect
-add        ds_ops::ds_reconnect targets edge_reconnect
-add        ds_ops::ds_set_port_params targets edge_set_port_params
-add        ds_ops::ds_set_modem_ctl targets edge_set_modem_ctl
-add        ds_ops::ds_get_modem_ctl targets edge_get_modem_ctl
-add        ds_ops::ds_break_ctl targets edge_break_ctl
-add        ds_ops::ds_loopback targets edge_loopback
-add        ds_ops::ds_tx targets edge_tx
-add        ds_ops::ds_rx targets edge_rx
-add        ds_ops::ds_stop targets edge_stop
-add        ds_ops::ds_start targets edge_start
-add        ds_ops::ds_fifo_flush targets edge_fifo_flush
-add        ds_ops::ds_fifo_drain targets edge_fifo_drain
-add        ds_ops::ds_out_pipe targets warlock_dummy
-add        ds_ops::ds_in_pipe targets warlock_dummy
-
-add        edge_port::ep_cb.cb_tx targets usbser_tx_cb
-add        edge_port::ep_cb.cb_rx targets usbser_rx_cb
-add        edge_port::ep_cb.cb_status targets usbser_status_cb
-
-add        bus_ops::bus_add_eventcall targets warlock_dummy
-add        bus_ops::bus_get_eventcookie targets warlock_dummy
-add        bus_ops::bus_post_event targets warlock_dummy
-add        bus_ops::bus_remove_eventcall targets warlock_dummy
-add        bus_ops::bus_intr_ctl targets warlock_dummy
-add        bus_ops::bus_config targets warlock_dummy
-add        bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usbser_edge_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usbser_edge_with_usba.wlcmd
deleted file mode 100644
index a52f3e3b7c..0000000000
--- a/usr/src/uts/common/io/warlock/usbser_edge_with_usba.wlcmd
+++ /dev/null
@@ -1,222 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usbser_state
-one edge_pipe
-one edge_state
-one edge_port
-
-
-### specify the root functions
-
-root	usbser_first_device
-root	usbser_putchar
-root	usbser_getchar
-root	usbser_ischar
-root	usbser_polledio_enter
-root	usbser_polledio_exit
-root	usb_console_output_fini
-root	usb_console_input_enter
-root	usb_console_input_exit
-root	usb_console_input_fini
-root	usb_console_input_init
-root	usb_console_read
-root	usb_get_dev_descr
-root	usb_get_if_number
-root	usb_parse_CV_cfg_descr
-root	usb_parse_CV_ep_descr
-root	usb_parse_CV_if_descr
-root    usb_parse_comp_ep_descr
-root	usb_pipe_get_private
-root	usb_get_current_frame_number
-root	usb_get_max_isoc_pkts
-root	usb_pipe_set_private
-root	usba_ready_interface_node
-root	usba_free_hcdi_ops
-root	usba_async_req_raise_power
-root	usba_async_req_lower_power
-root	usb_req_raise_power
-root	usb_req_lower_power
-root	usb_set_device_pwrlvl0
-root	usb_set_device_pwrlvl1
-root	usb_set_device_pwrlvl2
-root	usb_set_device_pwrlvl3
-root	usb_is_pm_enabled
-root	usb_async_req
-root	usb_pipe_bulk_transfer_size
-root 	usb_get_ep_data
-root	usba_pipe_get_policy
-root	usb_pipe_ctrl_xfer_wait
-root	usb_pipe_drain_reqs
-root    usb_try_serialize_access
-root    usb_fini_serialization
-root    usb_init_serialization
-root    usb_release_access
-root    usb_serialize_access
-root	usb_clr_feature
-root    usb_clear_feature
-root    usb_get_alt_if
-root    usb_get_ep_descr
-root    usb_get_if_descr
-root    usb_log
-root    usb_pipe_isoc_xfer
-root    usb_pipe_stop_isoc_polling
-root    usb_set_alt_if
-root    usb_set_cfg
-root    usb_get_cfg
-root	usb_ep_num
-root	usb_get_status
-root	usb_pipe_reset
-root	usb_log_descr_tree
-root	usb_print_descr_tree
-root    usb_rval2errno
-root	usb_register_hotplug_cbs
-root	usb_get_current_cfgidx
-root    usb_register_client
-root	usb_reset_device
-root	usb_register_dev_driver
-root	usb_unregister_dev_driver
-
-root    usb_ugen_attach
-root    usb_ugen_close
-root    usb_ugen_detach
-root    usb_ugen_disconnect_ev_cb
-root    usb_ugen_get_hdl
-root    usb_ugen_open
-root    usb_ugen_poll
-root    usb_ugen_power
-root    usb_ugen_read
-root    usb_ugen_reconnect_ev_cb
-root    usb_ugen_write
-
-root	hcdi_autoclearing
-root	hcdi_cb_thread
-root    hcdi_shared_cb_thread
-
-
-root	hubd_restore_state_cb
-root    hubd_disconnect_event_cb
-root    hubd_post_resume_event_cb
-root    hubd_pre_suspend_event_cb
-root    hubd_reconnect_event_cb
-root	hubd_hotplug_thread
-root	hubd_reset_thread
-root	hubd_cpr_post_user_callb
-root    hubd_root_hub_cleanup_thread
-root	hubd_bus_power
-
-root	usba_common_power
-root	usba_common_register_events
-root	usba_ready_interface_association_node
-root	usba_pipe_do_async_func_thread
-root	usba_pipe_sync_reset
-root    usba_get_hc_dma_attr
-root    usba_hcdi_get_req_private
-root    usba_hcdi_set_req_private
-root    usba_dbuf_tail
-root	usba_hubdi_power
-root	usba_hubdi_root_hub_power
-root	usba_get_hotplug_stats
-root	usba_reset_hotplug_stats
-root	usba_ascii_string_descr
-root	usba_move_list
-root    usba_taskq_destroy
-root	usba_mk_mctl
-root	usb_fail_checkpoint
-
-root	ohci_intr
-root	ehci_intr
-root    ohci_quiesce
-root    uhci_quiesce
-root    ehci_quiesce
-
-### specify the edgeport root functions
-root usbser_soft_state_size
-root usbser_edge_open
-root usbser_close
-root usbser_wput
-root usbser_wsrv
-root usbser_rsrv
-root usbser_tx_cb
-root usbser_rx_cb
-root usbser_status_cb
-root usbser_wq_thread
-root usbser_rq_thread
-root usbser_disconnect_cb
-root usbser_reconnect_cb
-root usbser_cpr_suspend
-root usbser_cpr_resume
-
-root edgesp_bulkin_cb
-root edgesp_bulkout_cb
-root edgesp_intr_cb
-root edgesp_intr_ex_cb
-
-root edgeti_bulkin_cb
-root edgeti_bulkout_cb
-root edgeti_intr_cb
-root edgeti_intr_ex_cb
-
-### specify edgeport function pointers
-
-add        ds_ops::ds_attach targets edge_attach
-add        ds_ops::ds_detach targets edge_detach
-add        ds_ops::ds_register_cb targets edge_register_cb
-add        ds_ops::ds_unregister_cb targets edge_unregister_cb
-add        ds_ops::ds_open_port targets edge_open_port
-add        ds_ops::ds_close_port targets edge_close_port
-add        ds_ops::ds_usb_power targets edge_usb_power
-add        ds_ops::ds_suspend targets edge_suspend
-add        ds_ops::ds_resume targets edge_resume
-add        ds_ops::ds_disconnect targets edge_disconnect
-add        ds_ops::ds_reconnect targets edge_reconnect
-add        ds_ops::ds_set_port_params targets edge_set_port_params
-add        ds_ops::ds_set_modem_ctl targets edge_set_modem_ctl
-add        ds_ops::ds_get_modem_ctl targets edge_get_modem_ctl
-add        ds_ops::ds_break_ctl targets edge_break_ctl
-add        ds_ops::ds_loopback targets edge_loopback
-add        ds_ops::ds_tx targets edge_tx
-add        ds_ops::ds_rx targets edge_rx
-add        ds_ops::ds_stop targets edge_stop
-add        ds_ops::ds_start targets edge_start
-add        ds_ops::ds_fifo_flush targets edge_fifo_flush
-add        ds_ops::ds_fifo_drain targets edge_fifo_drain
-add        ds_ops::ds_out_pipe targets warlock_dummy
-add        ds_ops::ds_in_pipe targets warlock_dummy
-
-add        edge_port::ep_cb.cb_tx targets usbser_tx_cb
-add        edge_port::ep_cb.cb_rx targets usbser_rx_cb
-add        edge_port::ep_cb.cb_status targets usbser_status_cb
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usb_ctrl_req::ctrl_cb	targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb	targets warlock_dummy
-add usb_bulk_req::bulk_cb	targets edgesp_bulkin_cb
-add usb_bulk_req::bulk_exc_cb	targets edgesp_bulkin_cb
-add usb_bulk_req::bulk_cb	targets edgesp_bulkout_cb
-add usb_bulk_req::bulk_exc_cb	targets edgesp_bulkout_cb
-
-add usb_bulk_req::bulk_cb	targets edgeti_bulkin_cb
-add usb_bulk_req::bulk_exc_cb	targets edgeti_bulkin_cb
-add usb_bulk_req::bulk_cb	targets edgeti_bulkout_cb
-add usb_bulk_req::bulk_exc_cb	targets edgeti_bulkout_cb
-
-add usb_isoc_req::isoc_cb	targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb	targets warlock_dummy
-add usba_pipe_async_req::callback	targets warlock_dummy
-add usba_pipe_async_req::sync_func	targets warlock_dummy
-add usba_pm_req::cb			targets warlock_dummy
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
diff --git a/usr/src/uts/common/io/warlock/usbser_keyspan.wlcmd b/usr/src/uts/common/io/warlock/usbser_keyspan.wlcmd
deleted file mode 100644
index f74b829b3d..0000000000
--- a/usr/src/uts/common/io/warlock/usbser_keyspan.wlcmd
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-one usbser_state
-one keyspan_state
-one keyspan_pipe
-one keyspan_port
-
-### specify the root functions
-
-root usbser_first_device
-root usbser_putchar
-root usbser_getchar
-root usbser_ischar
-root usbser_polledio_enter
-root usbser_polledio_exit
-root usbser_soft_state_size
-root usbser_keyspan_open
-root usbser_close
-root usbser_wput
-root usbser_wsrv
-root usbser_rsrv
-root usbser_tx_cb
-root usbser_rx_cb
-root usbser_status_cb
-root usbser_wq_thread
-root usbser_rq_thread
-root usbser_disconnect_cb
-root usbser_reconnect_cb
-root usbser_cpr_suspend
-root usbser_cpr_resume
-
-root keyspan_bulkin_cb
-root keyspan_bulkout_cb
-root keyspan_status_cb
-
-root keyspan_bulkin_cb_usa49wg
-root keyspan_introut_cb_usa49wg
-root keyspan_intr_cb_usa49wg
-root keyspan_intr_ex_cb_usa49wg
-
-### specify keyspan function pointers
-
-add        ds_ops::ds_attach targets keyspan_attach
-add        ds_ops::ds_detach targets keyspan_detach
-add        ds_ops::ds_register_cb targets keyspan_register_cb
-add        ds_ops::ds_unregister_cb targets keyspan_unregister_cb
-add        ds_ops::ds_open_port targets keyspan_open_port
-add        ds_ops::ds_close_port targets keyspan_close_port
-add        ds_ops::ds_usb_power targets keyspan_usb_power
-add        ds_ops::ds_suspend targets keyspan_suspend
-add        ds_ops::ds_resume targets keyspan_resume
-add        ds_ops::ds_disconnect targets keyspan_disconnect
-add        ds_ops::ds_reconnect targets keyspan_reconnect
-add        ds_ops::ds_set_port_params targets keyspan_set_port_params
-add        ds_ops::ds_set_modem_ctl targets keyspan_set_modem_ctl
-add        ds_ops::ds_get_modem_ctl targets keyspan_get_modem_ctl
-add        ds_ops::ds_break_ctl targets keyspan_break_ctl
-add        ds_ops::ds_loopback targets keyspan_loopback
-add        ds_ops::ds_tx targets keyspan_tx
-add        ds_ops::ds_rx targets keyspan_rx
-add        ds_ops::ds_stop targets keyspan_stop
-add        ds_ops::ds_start targets keyspan_start
-add        ds_ops::ds_fifo_flush targets keyspan_fifo_flush
-add        ds_ops::ds_fifo_drain targets keyspan_fifo_drain
-add        ds_ops::ds_out_pipe targets warlock_dummy
-add        ds_ops::ds_in_pipe targets warlock_dummy
-
-add        keyspan_port::kp_cb.cb_tx targets usbser_tx_cb
-add        keyspan_port::kp_cb.cb_rx targets usbser_rx_cb
-add        keyspan_port::kp_cb.cb_status targets usbser_status_cb
-
-add        bus_ops::bus_add_eventcall targets warlock_dummy
-add        bus_ops::bus_get_eventcookie targets warlock_dummy
-add        bus_ops::bus_post_event targets warlock_dummy
-add        bus_ops::bus_remove_eventcall targets warlock_dummy
-add        bus_ops::bus_intr_ctl targets warlock_dummy
-add        bus_ops::bus_config targets warlock_dummy
-add        bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usbser_keyspan_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usbser_keyspan_with_usba.wlcmd
deleted file mode 100644
index 7bd46ef9b0..0000000000
--- a/usr/src/uts/common/io/warlock/usbser_keyspan_with_usba.wlcmd
+++ /dev/null
@@ -1,245 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usbser_state
-one keyspan_state
-one keyspan_pipe
-one keyspan_port
-
-### specify the root functions
-
-root	usbser_first_device
-root	usbser_putchar
-root	usbser_getchar
-root	usbser_ischar
-root	usbser_polledio_enter
-root	usbser_polledio_exit
-root	usb_console_output_fini
-root	usb_console_input_enter
-root	usb_console_input_exit
-root	usb_console_input_fini
-root	usb_console_input_init
-root	usb_console_read
-root	usb_get_dev_descr
-root	usb_get_if_number
-root	usb_parse_CV_cfg_descr
-root	usb_parse_CV_ep_descr
-root	usb_parse_CV_if_descr
-root	usb_parse_comp_ep_descr
-root	usb_pipe_get_private
-root	usb_get_current_frame_number
-root	usb_get_max_isoc_pkts
-root	usb_pipe_set_private
-root	usba_ready_interface_node
-root	usba_free_hcdi_ops
-root	usba_async_req_raise_power
-root	usba_async_req_lower_power
-root	usb_req_raise_power
-root	usb_req_lower_power
-root	usb_set_device_pwrlvl0
-root	usb_set_device_pwrlvl1
-root	usb_set_device_pwrlvl2
-root	usb_set_device_pwrlvl3
-root	usb_is_pm_enabled
-root	usb_async_req
-root	usb_pipe_bulk_transfer_size
-root 	usb_get_ep_data
-root	usba_pipe_get_policy
-root	usb_pipe_ctrl_xfer_wait
-root	usb_pipe_drain_reqs
-root    usb_try_serialize_access
-root    usb_fini_serialization
-root    usb_init_serialization
-root    usb_release_access
-root    usb_serialize_access
-root	usb_clr_feature
-root    usb_clear_feature
-root    usb_get_alt_if
-root    usb_get_ep_descr
-root    usb_get_if_descr
-root    usb_log
-root    usb_pipe_isoc_xfer
-root    usb_pipe_stop_isoc_polling
-root    usb_set_alt_if
-root    usb_set_cfg
-root    usb_get_cfg
-root	usb_ep_num
-root	usb_get_status
-root	usb_pipe_reset
-root	usb_log_descr_tree
-root	usb_print_descr_tree
-root    usb_rval2errno
-root	usb_register_hotplug_cbs
-root	usb_get_current_cfgidx
-root    usb_register_client
-root	usb_reset_device
-root	usb_register_dev_driver
-root	usb_unregister_dev_driver
-
-root    usb_ugen_attach
-root    usb_ugen_close
-root    usb_ugen_detach
-root    usb_ugen_disconnect_ev_cb
-root    usb_ugen_get_hdl
-root    usb_ugen_open
-root    usb_ugen_poll
-root    usb_ugen_power
-root    usb_ugen_read
-root    usb_ugen_reconnect_ev_cb
-root    usb_ugen_write
-
-root	hcdi_autoclearing
-root	hcdi_cb_thread
-root    hcdi_shared_cb_thread
-
-
-root	hubd_restore_state_cb
-root    hubd_disconnect_event_cb
-root    hubd_post_resume_event_cb
-root    hubd_pre_suspend_event_cb
-root    hubd_reconnect_event_cb
-root	hubd_hotplug_thread
-root	hubd_reset_thread
-root	hubd_cpr_post_user_callb
-root    hubd_root_hub_cleanup_thread
-root	hubd_bus_power
-
-root	usba_common_power
-root	usba_common_register_events
-root	usba_ready_interface_association_node
-root	usba_pipe_do_async_func_thread
-root	usba_pipe_sync_reset
-root    usba_get_hc_dma_attr
-root    usba_hcdi_get_req_private
-root    usba_hcdi_set_req_private
-root    usba_dbuf_tail
-root	usba_hubdi_power
-root	usba_hubdi_root_hub_power
-root	usba_get_hotplug_stats
-root	usba_reset_hotplug_stats
-root	usba_ascii_string_descr
-root	usba_move_list
-root    usba_taskq_destroy
-root	usba_mk_mctl
-root	usb_fail_checkpoint
-
-root	ohci_intr
-root	ehci_intr
-root    ohci_quiesce
-root    uhci_quiesce
-root    ehci_quiesce
-
-### specify the keyspan root functions
-root usbser_soft_state_size
-root usbser_keyspan_open
-root usbser_close
-root usbser_wput
-root usbser_wsrv
-root usbser_rsrv
-root usbser_tx_cb
-root usbser_rx_cb
-root usbser_status_cb
-root usbser_wq_thread
-root usbser_rq_thread
-root usbser_disconnect_cb
-root usbser_reconnect_cb
-root usbser_cpr_suspend
-root usbser_cpr_resume
-
-root keyspan_bulkin_cb
-root keyspan_bulkout_cb
-root keyspan_status_cb
-
-root keyspan_bulkin_cb_usa49wg
-root keyspan_introut_cb_usa49wg
-root keyspan_intr_cb_usa49wg
-root keyspan_intr_ex_cb_usa49wg
-
-### specify keyspan function pointers
-
-add        ds_ops::ds_attach targets keyspan_attach
-add        ds_ops::ds_detach targets keyspan_detach
-add        ds_ops::ds_register_cb targets keyspan_register_cb
-add        ds_ops::ds_unregister_cb targets keyspan_unregister_cb
-add        ds_ops::ds_open_port targets keyspan_open_port
-add        ds_ops::ds_close_port targets keyspan_close_port
-add        ds_ops::ds_usb_power targets keyspan_usb_power
-add        ds_ops::ds_suspend targets keyspan_suspend
-add        ds_ops::ds_resume targets keyspan_resume
-add        ds_ops::ds_disconnect targets keyspan_disconnect
-add        ds_ops::ds_reconnect targets keyspan_reconnect
-add        ds_ops::ds_set_port_params targets keyspan_set_port_params
-add        ds_ops::ds_set_modem_ctl targets keyspan_set_modem_ctl
-add        ds_ops::ds_get_modem_ctl targets keyspan_get_modem_ctl
-add        ds_ops::ds_break_ctl targets keyspan_break_ctl
-add        ds_ops::ds_loopback targets keyspan_loopback
-add        ds_ops::ds_tx targets keyspan_tx
-add        ds_ops::ds_rx targets keyspan_rx
-add        ds_ops::ds_stop targets keyspan_stop
-add        ds_ops::ds_start targets keyspan_start
-add        ds_ops::ds_fifo_flush targets keyspan_fifo_flush
-add        ds_ops::ds_fifo_drain targets keyspan_fifo_drain
-add        ds_ops::ds_out_pipe targets warlock_dummy
-add        ds_ops::ds_in_pipe targets warlock_dummy
-
-add        keyspan_port::kp_cb.cb_tx targets usbser_tx_cb
-add        keyspan_port::kp_cb.cb_rx targets usbser_rx_cb
-add        keyspan_port::kp_cb.cb_status targets usbser_status_cb
-
-add hubd::h_cleanup_child	targets warlock_dummy
-add usb_ctrl_req::ctrl_cb	targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb	targets warlock_dummy
-add usb_bulk_req::bulk_cb	targets keyspan_bulkin_cb
-add usb_bulk_req::bulk_exc_cb	targets keyspan_bulkin_cb
-add usb_bulk_req::bulk_cb	targets keyspan_bulkout_cb
-add usb_bulk_req::bulk_exc_cb	targets keyspan_bulkout_cb
-add usb_bulk_req::bulk_cb	targets keyspan_status_cb
-add usb_bulk_req::bulk_exc_cb	targets keyspan_status_cb
-add usb_bulk_req::bulk_cb       targets keyspan_bulkin_cb_usa49wg
-add usb_bulk_req::bulk_exc_cb   targets keyspan_bulkin_cb_usa49wg
-add usb_intr_req::intr_cb       targets keyspan_introut_cb_usa49wg
-add usb_intr_req::intr_exc_cb   targets keyspan_introut_cb_usa49wg
-add usb_intr_req::intr_cb       targets keyspan_intr_cb_usa49wg
-add usb_intr_req::intr_exc_cb   targets keyspan_intr_ex_cb_usa49wg
-
-add usb_isoc_req::isoc_cb	targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb	targets warlock_dummy
-add usba_pipe_async_req::callback	targets warlock_dummy
-add usba_pipe_async_req::sync_func	targets warlock_dummy
-add usba_pm_req::cb			targets warlock_dummy
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
diff --git a/usr/src/uts/common/io/warlock/usbskel.wlcmd b/usr/src/uts/common/io/warlock/usbskel.wlcmd
deleted file mode 100644
index 0124361457..0000000000
--- a/usr/src/uts/common/io/warlock/usbskel.wlcmd
+++ /dev/null
@@ -1,43 +0,0 @@
-
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-one usbskel_state
-
-### specify the root functions
-
-root usbskel_normal_callback
-root usbskel_exception_callback
-root usbskel_disconnect_callback
-root usbskel_reconnect_callback
-
-add        bus_ops::bus_add_eventcall targets warlock_dummy
-add        bus_ops::bus_get_eventcookie targets warlock_dummy
-add        bus_ops::bus_post_event targets warlock_dummy
-add        bus_ops::bus_remove_eventcall targets warlock_dummy
-add        bus_ops::bus_intr_ctl targets warlock_dummy
-add        bus_ops::bus_config targets warlock_dummy
-add        bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usbskel_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usbskel_with_usba.wlcmd
deleted file mode 100644
index b6b4b07efc..0000000000
--- a/usr/src/uts/common/io/warlock/usbskel_with_usba.wlcmd
+++ /dev/null
@@ -1,168 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usbskel_state
-one usba_pipe_handle_data
-one usba_ph_impl
-one hubd
-one usba_device
-
-### specify the root functions
-
-root	usb_console_output_init
-root	usb_console_output_fini
-root	usb_console_output_enter
-root	usb_console_output_exit
-root	usb_console_write
-root	usb_console_input_enter
-root	usb_console_input_exit
-root	usb_console_read
-root	usb_get_dev_descr
-root	usb_parse_CV_cfg_descr
-root	usb_parse_CV_ep_descr
-root	usb_parse_CV_if_descr
-root    usb_parse_comp_ep_descr
-root	usb_pipe_reset
-root	usb_pipe_get_private
-root	usb_get_max_isoc_pkts
-root	usb_pipe_set_private
-root	usb_req_raise_power
-root	usb_req_lower_power
-root	usb_pipe_bulk_transfer_size
-root	usba_pipe_get_policy
-root	usb_pipe_ctrl_xfer_wait
-root	usb_try_serialize_access
-root	usb_get_current_frame_number
-root    usb_alloc_bulk_req
-root    usb_clear_feature
-root    usb_get_alt_if
-root    usb_get_ep_descr
-root    usb_get_if_descr
-root    usb_pipe_bulk_xfer
-root    usb_pipe_isoc_xfer
-root    usb_pipe_stop_isoc_polling
-root    usb_set_alt_if
-root    usb_set_cfg
-root    usb_get_cfg
-root	usb_ep_num
-root	usb_console_input_fini
-root	usb_console_input_init
-root	usb_print_descr_tree
-root    usb_rval2errno
-root	usb_free_bulk_req
-root	usb_clr_feature
-root	usb_get_ep_data
-root	usb_fini_serialization
-root	usb_init_serialization
-root	usb_release_access
-root	usb_serialize_access
-root	usb_is_pm_enabled
-root	usb_get_current_cfgidx
-root    usb_register_client
-root	usb_reset_device
-root	usb_register_dev_driver
-root	usb_unregister_dev_driver
-
-root    usb_ugen_attach
-root    usb_ugen_close
-root    usb_ugen_detach
-root    usb_ugen_disconnect_ev_cb
-root    usb_ugen_get_hdl
-root    usb_ugen_open
-root    usb_ugen_poll
-root    usb_ugen_power
-root    usb_ugen_read
-root    usb_ugen_reconnect_ev_cb
-root    usb_ugen_write
-
-root	usba_common_power
-root	usba_common_register_events
-root	usba_ready_interface_association_node
-root	usba_free_hcdi_ops
-root	usba_ready_interface_node
-root	usba_async_req_raise_power
-root	usba_async_req_lower_power
-root    usba_get_hc_dma_attr
-root    usba_hcdi_get_req_private
-root    usba_hcdi_set_req_private
-root	usba_pipe_do_async_func_thread
-root	usba_get_hotplug_stats
-root	usba_reset_hotplug_stats
-root    usba_dbuf_tail
-root	usba_move_list
-root    usba_taskq_destroy
-
-root	hcdi_autoclearing
-root	hcdi_cb_thread
-root    hcdi_shared_cb_thread
-root    ohci_quiesce
-root    uhci_quiesce
-root    ehci_quiesce
-
-root	hubd_bus_power
-root	hubd_hotplug_thread
-root	hubd_reset_thread
-root	hubd_restore_state_cb
-root    hubd_disconnect_event_cb
-root    hubd_post_resume_event_cb
-root    hubd_pre_suspend_event_cb
-root    hubd_reconnect_event_cb
-root	hubd_root_hub_cleanup_thread
-root	hubd_cpr_post_user_callb
-root	usba_mk_mctl
-root	usb_fail_checkpoint
-
-### specify the usbskel root functions
-
-root usbskel_normal_callback
-root usbskel_exception_callback
-root usbskel_disconnect_callback
-root usbskel_reconnect_callback
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_close
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_reset
-
-add usba_pipe_async_req::callback targets warlock_dummy
-add usb_bulk_req::bulk_cb targets warlock_dummy
-add usb_bulk_req::bulk_exc_cb targets warlock_dummy
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usb_intr_req::intr_cb targets warlock_dummy
-add usb_intr_req::intr_exc_cb targets warlock_dummy
-
-add usba_pm_req::cb targets warlock_dummy
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
diff --git a/usr/src/uts/common/io/warlock/usbsprl.wlcmd b/usr/src/uts/common/io/warlock/usbsprl.wlcmd
deleted file mode 100644
index 720e87c2c6..0000000000
--- a/usr/src/uts/common/io/warlock/usbsprl.wlcmd
+++ /dev/null
@@ -1,90 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-one usbser_state
-one pl2303_state
-
-### specify the root functions
-
-root usbser_first_device
-root usbser_putchar
-root usbser_getchar
-root usbser_ischar
-root usbser_polledio_enter
-root usbser_polledio_exit
-root usbser_soft_state_size
-root usbser_pl2303_open
-root usbser_close
-root usbser_wput
-root usbser_wsrv
-root usbser_rsrv
-root usbser_tx_cb
-root usbser_rx_cb
-root usbser_status_cb
-root usbser_wq_thread
-root usbser_rq_thread
-root usbser_disconnect_cb
-root usbser_reconnect_cb
-root usbser_cpr_suspend
-root usbser_cpr_resume
-
-root pl2303_bulkin_cb
-root pl2303_bulkout_cb
-
-### specify pl2303 function pointers
-
-add ds_ops::ds_attach targets pl2303_attach
-add ds_ops::ds_detach targets pl2303_detach
-add ds_ops::ds_register_cb targets pl2303_register_cb
-add ds_ops::ds_unregister_cb targets pl2303_unregister_cb
-add ds_ops::ds_open_port targets pl2303_open_port
-add ds_ops::ds_close_port targets pl2303_close_port
-add ds_ops::ds_usb_power targets pl2303_usb_power
-add ds_ops::ds_suspend targets pl2303_suspend
-add ds_ops::ds_resume targets pl2303_resume
-add ds_ops::ds_disconnect targets pl2303_disconnect
-add ds_ops::ds_reconnect targets pl2303_reconnect
-add ds_ops::ds_set_port_params targets pl2303_set_port_params
-add ds_ops::ds_set_modem_ctl targets pl2303_set_modem_ctl
-add ds_ops::ds_get_modem_ctl targets pl2303_get_modem_ctl
-add ds_ops::ds_break_ctl targets pl2303_break_ctl
-add ds_ops::ds_tx targets pl2303_tx
-add ds_ops::ds_rx targets pl2303_rx
-add ds_ops::ds_stop targets pl2303_stop
-add ds_ops::ds_start targets pl2303_start
-add ds_ops::ds_fifo_flush targets pl2303_fifo_flush
-add ds_ops::ds_fifo_drain targets pl2303_fifo_drain
-add ds_ops::ds_out_pipe targets pl2303_out_pipe
-add ds_ops::ds_in_pipe targets pl2303_in_pipe
-
-add pl2303_state::pl_cb.cb_tx targets usbser_tx_cb
-add pl2303_state::pl_cb.cb_rx targets usbser_rx_cb
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usbsprl_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usbsprl_with_usba.wlcmd
deleted file mode 100644
index c758c93697..0000000000
--- a/usr/src/uts/common/io/warlock/usbsprl_with_usba.wlcmd
+++ /dev/null
@@ -1,223 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usbser_state
-one pl2303_state
-
-### specify the root functions
-
-root usbser_first_device
-root usbser_putchar
-root usbser_getchar
-root usbser_ischar
-root usbser_polledio_enter
-root usbser_polledio_exit
-root usb_console_output_fini
-root usb_console_input_enter
-root usb_console_input_exit
-root usb_console_input_fini
-root usb_console_input_init
-root usb_console_read
-root usb_get_dev_descr
-root usb_get_if_number
-root usb_parse_CV_cfg_descr
-root usb_parse_CV_ep_descr
-root usb_parse_CV_if_descr
-root usb_parse_comp_ep_descr
-root usb_pipe_get_private
-root usb_get_current_frame_number
-root usb_get_max_isoc_pkts
-root usb_pipe_set_private
-root usba_ready_interface_node
-root usba_free_hcdi_ops
-root usba_async_req_raise_power
-root usba_async_req_lower_power
-root usb_req_raise_power
-root usb_req_lower_power
-root usb_set_device_pwrlvl0
-root usb_set_device_pwrlvl1
-root usb_set_device_pwrlvl2
-root usb_set_device_pwrlvl3
-root usb_is_pm_enabled
-root usb_async_req
-root usb_pipe_bulk_transfer_size
-root usb_get_ep_data
-root usba_pipe_get_policy
-root usb_pipe_ctrl_xfer_wait
-root usb_pipe_drain_reqs
-root usb_try_serialize_access
-root usb_fini_serialization
-root usb_init_serialization
-root usb_release_access
-root usb_serialize_access
-root usb_clr_feature
-root usb_clear_feature
-root usb_get_alt_if
-root usb_get_ep_descr
-root usb_get_if_descr
-root usb_log
-root usb_pipe_isoc_xfer
-root usb_pipe_stop_isoc_polling
-root usb_set_alt_if
-root usb_set_cfg
-root usb_get_cfg
-root usb_ep_num
-root usb_get_status
-root usb_pipe_reset
-root usb_log_descr_tree
-root usb_print_descr_tree
-root usb_rval2errno
-root usb_register_hotplug_cbs
-root usb_get_current_cfgidx
-root usb_register_client
-root usb_reset_device
-root usb_register_dev_driver
-root usb_unregister_dev_driver
-
-root usb_ugen_attach
-root usb_ugen_close
-root usb_ugen_detach
-root usb_ugen_disconnect_ev_cb
-root usb_ugen_get_hdl
-root usb_ugen_open
-root usb_ugen_poll
-root usb_ugen_power
-root usb_ugen_read
-root usb_ugen_reconnect_ev_cb
-root usb_ugen_write
-
-root hcdi_autoclearing
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-
-root hubd_restore_state_cb
-root hubd_disconnect_event_cb
-root hubd_post_resume_event_cb
-root hubd_pre_suspend_event_cb
-root hubd_reconnect_event_cb
-root hubd_hotplug_thread
-root hubd_reset_thread
-root hubd_cpr_post_user_callb
-root hubd_root_hub_cleanup_thread
-root hubd_bus_power
-
-root usba_common_power
-root usba_common_register_events
-root usba_ready_interface_association_node
-root usba_pipe_do_async_func_thread
-root usba_pipe_sync_reset
-root usba_get_hc_dma_attr
-root usba_hcdi_get_req_private
-root usba_hcdi_set_req_private
-root usba_dbuf_tail
-root usba_hubdi_power
-root usba_hubdi_root_hub_power
-root usba_get_hotplug_stats
-root usba_reset_hotplug_stats
-root usba_ascii_string_descr
-root usba_move_list
-root usba_taskq_destroy
-root usba_mk_mctl
-root usb_fail_checkpoint
-
-root ohci_intr
-root ehci_intr
-root    ohci_quiesce
-root    uhci_quiesce
-root    ehci_quiesce
-
-### specify the pl2303 root functions
-
-root usbser_soft_state_size
-root usbser_pl2303_open
-root usbser_close
-root usbser_wput
-root usbser_wsrv
-root usbser_rsrv
-root usbser_tx_cb
-root usbser_rx_cb
-root usbser_status_cb
-root usbser_wq_thread
-root usbser_rq_thread
-root usbser_disconnect_cb
-root usbser_reconnect_cb
-root usbser_cpr_suspend
-root usbser_cpr_resume
-
-root pl2303_bulkin_cb
-root pl2303_bulkout_cb
-
-### specify pl2303 function pointers
-
-add ds_ops::ds_attach targets pl2303_attach
-add ds_ops::ds_detach targets pl2303_detach
-add ds_ops::ds_register_cb targets pl2303_register_cb
-add ds_ops::ds_unregister_cb targets pl2303_unregister_cb
-add ds_ops::ds_open_port targets pl2303_open_port
-add ds_ops::ds_close_port targets pl2303_close_port
-add ds_ops::ds_usb_power targets pl2303_usb_power
-add ds_ops::ds_suspend targets pl2303_suspend
-add ds_ops::ds_resume targets pl2303_resume
-add ds_ops::ds_disconnect targets pl2303_disconnect
-add ds_ops::ds_reconnect targets pl2303_reconnect
-add ds_ops::ds_set_port_params targets pl2303_set_port_params
-add ds_ops::ds_set_modem_ctl targets pl2303_set_modem_ctl
-add ds_ops::ds_get_modem_ctl targets pl2303_get_modem_ctl
-add ds_ops::ds_break_ctl targets pl2303_break_ctl
-add ds_ops::ds_tx targets pl2303_tx
-add ds_ops::ds_rx targets pl2303_rx
-add ds_ops::ds_stop targets pl2303_stop
-add ds_ops::ds_start targets pl2303_start
-add ds_ops::ds_fifo_flush targets pl2303_fifo_flush
-add ds_ops::ds_fifo_drain targets pl2303_fifo_drain
-add ds_ops::ds_out_pipe targets pl2303_out_pipe
-add ds_ops::ds_in_pipe targets pl2303_in_pipe
-
-add pl2303_state::pl_cb.cb_tx targets usbser_tx_cb
-add pl2303_state::pl_cb.cb_rx targets usbser_rx_cb
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usb_ctrl_req::ctrl_cb	targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb	targets warlock_dummy
-add usb_bulk_req::bulk_cb	targets pl2303_bulkin_cb
-add usb_bulk_req::bulk_exc_cb	targets pl2303_bulkin_cb
-add usb_bulk_req::bulk_cb	targets pl2303_bulkout_cb
-add usb_bulk_req::bulk_exc_cb	targets pl2303_bulkout_cb
-
-add usb_isoc_req::isoc_cb	targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb	targets warlock_dummy
-add usba_pipe_async_req::callback	targets warlock_dummy
-add usba_pipe_async_req::sync_func	targets warlock_dummy
-add usba_pm_req::cb			targets warlock_dummy
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
diff --git a/usr/src/uts/common/io/warlock/usbvc.wlcmd b/usr/src/uts/common/io/warlock/usbvc.wlcmd
deleted file mode 100644
index 906abbb1fe..0000000000
--- a/usr/src/uts/common/io/warlock/usbvc.wlcmd
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-one usbvc_state
-
-### specify the root functions
-
-root usbvc_open
-root usbvc_close
-root usbvc_read
-root usbvc_ioctl
-root usbvc_power
-
-root usbvc_isoc_cb
-root usbvc_isoc_exc_cb
-root usbvc_disconnect_event_cb
-root usbvc_reconnect_event_cb
-
-add        bus_ops::bus_add_eventcall targets warlock_dummy
-add        bus_ops::bus_get_eventcookie targets warlock_dummy
-add        bus_ops::bus_post_event targets warlock_dummy
-add        bus_ops::bus_remove_eventcall targets warlock_dummy
-add        bus_ops::bus_intr_ctl targets warlock_dummy
-add        bus_ops::bus_config targets warlock_dummy
-add        bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usbvc_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usbvc_with_usba.wlcmd
deleted file mode 100644
index a92af202d8..0000000000
--- a/usr/src/uts/common/io/warlock/usbvc_with_usba.wlcmd
+++ /dev/null
@@ -1,174 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usbvc_state
-
-### specify the root functions
-
-root	usb_console_output_init
-root	usb_console_output_fini
-root	usb_console_output_enter
-root	usb_console_output_exit
-root	usb_console_write
-root	usb_console_input_enter
-root	usb_console_input_exit
-root	usb_console_input_fini
-root	usb_console_input_init
-root	usb_console_read
-root	usb_get_dev_descr
-root	usb_get_if_number
-root	usb_parse_CV_cfg_descr
-root	usb_parse_CV_ep_descr
-root	usb_parse_CV_if_descr
-root    usb_parse_comp_ep_descr
-root	usb_pipe_get_private
-root	usb_get_current_frame_number
-root	usb_get_max_isoc_pkts
-root	usb_pipe_set_private
-root	usba_ready_interface_node
-root	usba_free_hcdi_ops
-root	usba_async_req_raise_power
-root	usba_async_req_lower_power
-root	usb_req_raise_power
-root	usb_req_lower_power
-root	usb_set_device_pwrlvl0
-root	usb_set_device_pwrlvl1
-root	usb_set_device_pwrlvl2
-root	usb_set_device_pwrlvl3
-root	usb_is_pm_enabled
-root	usb_async_req
-root	usb_pipe_bulk_transfer_size
-root 	usb_get_ep_data
-root	usba_pipe_get_policy
-root	usb_pipe_ctrl_xfer_wait
-root	usb_pipe_drain_reqs
-root    usb_try_serialize_access
-root	usb_clr_feature
-root    usb_clear_feature
-root    usb_get_alt_if
-root    usb_get_ep_descr
-root    usb_get_if_descr
-root    usb_log
-root    usb_pipe_isoc_xfer
-root    usb_pipe_stop_isoc_polling
-root    usb_set_alt_if
-root    usb_set_cfg
-root    usb_get_cfg
-root	usb_ep_num
-root	usb_get_status
-root	usb_pipe_reset
-root	usb_log_descr_tree
-root	usb_print_descr_tree
-root    usb_rval2errno
-root	usb_register_hotplug_cbs
-root	usb_get_current_cfgidx
-root    usb_register_client
-root	usb_reset_device
-root	usb_ugen_power
-root	usb_ugen_attach
-root	usb_ugen_close
-root	usb_ugen_detach
-root	usb_ugen_disconnect_ev_cb
-root	usb_ugen_get_hdl
-root	usb_ugen_open
-root	usb_ugen_poll
-root	usb_ugen_read
-root	usb_ugen_reconnect_ev_cb
-root	usb_ugen_write
-root	usb_register_dev_driver
-root	usb_unregister_dev_driver
-
-root	hcdi_autoclearing
-root	hcdi_cb_thread
-root    hcdi_shared_cb_thread
-
-
-root	hubd_restore_state_cb
-root    hubd_disconnect_event_cb
-root    hubd_post_resume_event_cb
-root    hubd_pre_suspend_event_cb
-root    hubd_reconnect_event_cb
-root	hubd_hotplug_thread
-root	hubd_reset_thread
-root	hubd_cpr_post_user_callb
-root    hubd_root_hub_cleanup_thread
-root	hubd_bus_power
-
-root	usba_common_power
-root	usba_common_register_events
-root	usba_ready_interface_association_node
-root	usba_pipe_do_async_func_thread
-root	usba_pipe_sync_reset
-root    usba_get_hc_dma_attr
-root    usba_hcdi_get_req_private
-root    usba_hcdi_set_req_private
-root    usba_dbuf_tail
-root	usba_hubdi_power
-root	usba_hubdi_root_hub_power
-root	usba_get_hotplug_stats
-root	usba_reset_hotplug_stats
-root	usba_ascii_string_descr
-root	usba_move_list
-root    usba_taskq_destroy
-root	usba_mk_mctl
-root	usb_fail_checkpoint
-
-root	ohci_intr
-root	ehci_intr
-root    ohci_quiesce
-root    uhci_quiesce
-root    ehci_quiesce
-
-### specify the usbvc root functions
-root usbvc_open
-root usbvc_close
-root usbvc_read
-root usbvc_ioctl
-root usbvc_power
-root usbvc_isoc_cb
-root usbvc_isoc_exc_cb
-root usbvc_disconnect_event_cb
-root usbvc_reconnect_event_cb
-
-add hubd::h_cleanup_child	targets warlock_dummy
-add usb_ctrl_req::ctrl_cb	targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb	targets warlock_dummy
-add usb_isoc_req::isoc_cb	targets usbvc_isoc_cb
-add usb_isoc_req::isoc_exc_cb	targets usbvc_isoc_exc_cb
-add usba_pipe_async_req::callback	targets warlock_dummy
-add usba_pipe_async_req::sync_func	targets warlock_dummy
-add usba_pm_req::cb			targets warlock_dummy
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
diff --git a/usr/src/uts/common/io/warlock/wc.wlcmd b/usr/src/uts/common/io/warlock/wc.wlcmd
deleted file mode 100644
index 838839c745..0000000000
--- a/usr/src/uts/common/io/warlock/wc.wlcmd
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-add	bus_ops::bus_add_eventcall	target	warlock_dummy
-add	bus_ops::bus_config		target  warlock_dummy
-add	bus_ops::bus_get_eventcookie	target  warlock_dummy
-add	bus_ops::bus_intr_ctl		target  warlock_dummy
-add	bus_ops::bus_post_event		target  warlock_dummy
-add	bus_ops::bus_remove_eventcall	target  warlock_dummy
-add	bus_ops::bus_unconfig		target  warlock_dummy
-
-root	wcuwput
-root	wcopen
-root	wclrput
-root	wc_polled_enter
-root	wc_polled_exit
-root	wc_polled_getchar
-root	wc_polled_ischar
-root	wc_polled_putchar
-root	wcclose
-root	wcreioctl
-root	wcrstrt
-root	wc_modechg_cb
-root	vc_avl_compare
-
-if test `uname -p` = "sparc"; then
-root	wc_cons_wrtvec
-root	wconsout
-root	wcopoll
-fi
-
-#
-# The devfs part of virtual console only reads these three variables,
-# so we only have to hold the lock when writing to these variables.
-#
-readable	wc_dip
-readable	vc_active_console
-readable	vc_cons_user
-readable	vc_state::vc_flags
-
-#
-# Only called from sdev_vtops.c, will be checked in wc_devfs.wlcmd
-#
-ignore	vt_getactive
-ignore	vt_getconsuser
-ignore	vt_wc_attached
-
-#
-# Protected by D_MTPERMODE
-#
-ignore	vc_state::vc_acqsig
-ignore	vc_state::vc_bufcallid
-ignore	vc_state::vc_dispnum
-ignore	vc_state::vc_login
-ignore	vc_state::vc_minor
-ignore	vc_state::vc_pid
-ignore	vc_state::vc_relsig
-ignore	vc_state::vc_switch_mode
-ignore	vc_state::vc_switchto
-ignore	vc_state::vc_tem
-ignore	vc_state::vc_timeoutid
-ignore	vc_state::vc_ttycommon.t_iocpending
-ignore	vc_state::vc_ttycommon.t_readq
-ignore	vc_state::vc_ttycommon.t_writeq
-ignore	vc_state::vc_waitv
-ignore	vc_state::vc_wq
diff --git a/usr/src/uts/common/io/warlock/wc_devfs.wlcmd b/usr/src/uts/common/io/warlock/wc_devfs.wlcmd
deleted file mode 100644
index baca059abe..0000000000
--- a/usr/src/uts/common/io/warlock/wc_devfs.wlcmd
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# This file only checks those virtual console variables
-# which are shared with devfs.
-#
-
-
-add	bus_ops::bus_add_eventcall	target	warlock_dummy
-add	bus_ops::bus_config		target  warlock_dummy
-add	bus_ops::bus_get_eventcookie	target  warlock_dummy
-add	bus_ops::bus_intr_ctl		target  warlock_dummy
-add	bus_ops::bus_post_event		target  warlock_dummy
-add	bus_ops::bus_remove_eventcall	target  warlock_dummy
-add	bus_ops::bus_unconfig		target  warlock_dummy
-
-root	devvt_getvnodeops
-root	devvt_validate
-root	devvt_readdir
-root	devvt_lookup
-root	devvt_create
diff --git a/usr/src/uts/common/pcmcia/nexus/pcmcia.c b/usr/src/uts/common/pcmcia/nexus/pcmcia.c
index e2b6abbedd..4bac5d98e9 100644
--- a/usr/src/uts/common/pcmcia/nexus/pcmcia.c
+++ b/usr/src/uts/common/pcmcia/nexus/pcmcia.c
@@ -1775,13 +1775,13 @@ pcm_fix_bits(socket_enum_t src, socket_enum_t dst, int num, int dir)
 
 	if (dir == 0) {
 				/* LEFT */
-		for (i = 0; i <= (sizeof (dst) * PR_WORDSIZE) - num; i++) {
+		for (i = 0; i <= PCMCIA_MAX_SOCKETS - num; i++) {
 			if (PR_GET(src, i))
 				PR_SET(dst, i + num);
 		}
 	} else {
 				/* RIGHT */
-		for (i = num; i < sizeof (dst) * PR_WORDSIZE; i++) {
+		for (i = num; i < PCMCIA_MAX_SOCKETS; i++) {
 			if (PR_GET(src, i))
 				PR_SET(dst, i - num);
 		}
diff --git a/usr/src/uts/common/sys/pcmcia.h b/usr/src/uts/common/sys/pcmcia.h
index 53825a3639..d313eb1e56 100644
--- a/usr/src/uts/common/sys/pcmcia.h
+++ b/usr/src/uts/common/sys/pcmcia.h
@@ -31,8 +31,6 @@
 #ifndef _PCMCIA_H
 #define	_PCMCIA_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -283,7 +281,8 @@ struct pcmcia_mif {
 #define	PR_CLEAR(map, bit)	(((uchar_t *)(map))[(bit)/PR_WORDSIZE] &=\
 					~(1 << ((bit) & PR_MASK)))
 #define	PR_ADDR(map, bit)	(((uchar_t *)(map)) + ((bit)/PR_WORDSIZE))
-#define	PR_ZERO(map)		bzero((caddr_t)map, sizeof (map))
+#define	PR_ZERO(map)		\
+	bzero((caddr_t)map, PCMCIA_MAX_SOCKETS / PR_WORDSIZE)
 
 /* socket bit map */
 typedef uchar_t socket_enum_t[PCMCIA_MAX_SOCKETS/PR_WORDSIZE];
diff --git a/usr/src/uts/common/sys/sysevent.h b/usr/src/uts/common/sys/sysevent.h
index 255e98b871..c2be00ad27 100644
--- a/usr/src/uts/common/sys/sysevent.h
+++ b/usr/src/uts/common/sys/sysevent.h
@@ -71,9 +71,9 @@ extern "C" {
 #define	ILLUMOS_VENDOR	"ILLUMOS"
 #define	SE_USR_PUB	"usr:"
 #define	SE_KERN_PUB	"kern:"
-#define	SUNW_KERN_PUB	SUNW_VENDOR":"SE_KERN_PUB
-#define	SUNW_USR_PUB	SUNW_VENDOR":"SE_USR_PUB
-#define	ILLUMOS_KERN_PUB	ILLUMOS_VENDOR":"SE_KERN_PUB
+#define	SUNW_KERN_PUB	SUNW_VENDOR ":" SE_KERN_PUB
+#define	SUNW_USR_PUB	SUNW_VENDOR ":" SE_USR_PUB
+#define	ILLUMOS_KERN_PUB	ILLUMOS_VENDOR ":" SE_KERN_PUB
 
 /*
  * Event header and attribute value limits
diff --git a/usr/src/uts/i86pc/i86hvm/hvm_sd/Makefile b/usr/src/uts/i86pc/i86hvm/hvm_sd/Makefile
index f5dc7a922a..5123e0bd3a 100644
--- a/usr/src/uts/i86pc/i86hvm/hvm_sd/Makefile
+++ b/usr/src/uts/i86pc/i86hvm/hvm_sd/Makefile
@@ -37,8 +37,8 @@ UTSBASE	= ../../..
 #
 #	Define the module and object file sets.
 #
-# Normally when compiling sd there are .conf file definitions and
-# definitions for warlock, but we don't bother with those here.
+# Normally when compiling sd there are .conf file definitions,
+# but we don't bother with those here.
 #
 MODULE		= hvm_sd
 OBJECTS		= $(HVM_SD_OBJS:%=$(OBJS_DIR)/%)
diff --git a/usr/src/uts/intel/aac/Makefile b/usr/src/uts/intel/aac/Makefile
index 15e6b33d1a..d619d9fece 100644
--- a/usr/src/uts/intel/aac/Makefile
+++ b/usr/src/uts/intel/aac/Makefile
@@ -43,9 +43,6 @@ OBJECTS		= $(AAC_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(AAC_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR     = $(UTSBASE)/common/io/aac
-WARLOCK_OUT     = $(AAC_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -99,37 +96,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-SCSI_FILES = $(SCSI_OBJS:%.o= -l $(UTSBASE)/intel/scsi/%.ll)
-
-%.wlcmd:
-	cd $(WLCMD_DIR); $(TEST) -f $@ || $(SCCS) get $@
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files scsi.files aac.wlcmd
-	$(WARLOCK) -c $(WLCMD_DIR)/aac.wlcmd $(WARLOCK_OUT) \
-	$(SCSI_FILES) \
-	$(UTSBASE)/intel/warlock/scsi.ll \
-	-l $(UTSBASE)/intel/warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/aac/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd $(UTSBASE)/intel/warlock; pwd; $(MAKE) warlock
-
-scsi.files:
-	@cd $(UTSBASE)/intel/scsi; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/ac97/Makefile b/usr/src/uts/intel/ac97/Makefile
index 1161de1ade..2905c1a6ad 100644
--- a/usr/src/uts/intel/ac97/Makefile
+++ b/usr/src/uts/intel/ac97/Makefile
@@ -39,9 +39,6 @@ MODULE		= ac97
 OBJECTS		= $(AC97_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(AC97_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT	= $(AC97_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -67,10 +64,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
diff --git a/usr/src/uts/intel/ahci/Makefile b/usr/src/uts/intel/ahci/Makefile
index f5a003fab5..be7d89e485 100644
--- a/usr/src/uts/intel/ahci/Makefile
+++ b/usr/src/uts/intel/ahci/Makefile
@@ -25,7 +25,7 @@
 #
 
 #
-#	This makefile drives the production of the 
+#	This makefile drives the production of the
 #	"/kernel/drv/ahci" kernel module.
 #
 #	intel architecture dependent
@@ -38,15 +38,12 @@ UTSBASE	= ../..
 
 #
 #	Define the module and object file sets.
-#
-MODULE		= ahci 
+
+MODULE		= ahci
 OBJECTS		= $(AHCI_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(AHCI_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR     = $(UTSBASE)/common/io/sata/adapters/ahci
-WARLOCK_OUT     = $(AHCI_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -68,7 +65,7 @@ DEBUG_DEFS	+= $(DEBUG_FLGS)
 
 #
 # lint pass one enforcement
-#  
+#
 CFLAGS += $(CCVERBOSE)
 
 CERRWARN	+= -_gcc=-Wno-parentheses
@@ -96,10 +93,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -113,48 +108,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-AHCI_FILES   = $(MODULE).ll
-SD_FILES = $(SD_OBJS:%.o=../sd/%.ll)
-SATA_FILES = $(SATA_OBJS:%.o=-l ../sata/%.ll)
-SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
-CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WLCMD_DIR)/ahci.wlcmd $(WARLOCK_OUT) warlock_ddi.files \
-	sata.files scsi.files sd.files cmlb.files
-	$(WARLOCK) -c $(WLCMD_DIR)/ahci.wlcmd $(WARLOCK_OUT) \
-	$(SD_FILES) \
-	$(SCSI_FILES) \
-	$(CMLB_FILES) \
-        $(SATA_FILES) \
-	-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/sata/adapters/ahci/%.c
-	$(WLCC) $(CPPFLAGS) -D DEBUG -o $@ $<
-
-sata.files:
-	@cd ../sata; pwd; $(MAKE) warlock
-
-scsi.files:
-	@cd ../scsi; pwd; $(MAKE) warlock
-
-sd.files: 
-	@cd ../sd; pwd; $(MAKE) warlock_alone
-
-cmlb.files:
-	@cd ../cmlb; pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/audiohd/Makefile b/usr/src/uts/intel/audiohd/Makefile
index 2ccf42e4f2..11b5ae03fb 100644
--- a/usr/src/uts/intel/audiohd/Makefile
+++ b/usr/src/uts/intel/audiohd/Makefile
@@ -39,18 +39,15 @@ OBJECTS		= $(AUDIOHD_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(AUDIOHD_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/audio/drv/audiohd
-WARLOCK_OUT	= $(AUDIOHD_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
 #
 include $(UTSBASE)/intel/Makefile.intel
 
-# 
-#	Overrides, lint pass one enforcement 
-# 
+#
+#	Overrides, lint pass one enforcement
+#
 CFLAGS		+= $(CCVERBOSE)
 DEBUG_FLGS	=
 $(NOT_RELEASE_BUILD)DEBUG_DEFS	+= $(DEBUG_FLGS)
@@ -86,10 +83,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -103,30 +98,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-AUDIOHD_FILES = $(AUDIOHD_OBJS:%.o=../audiohd/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/audiohd.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/audiohd.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/audio/drv/audiohd/audiohd.c \
-		$(UTSBASE)/common/io/audio/drv/audiohd/audiohd.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/av1394/Makefile b/usr/src/uts/intel/av1394/Makefile
index fc112dc4c4..9ccf35ed33 100644
--- a/usr/src/uts/intel/av1394/Makefile
+++ b/usr/src/uts/intel/av1394/Makefile
@@ -35,9 +35,6 @@ MODULE		= av1394
 OBJECTS		= $(AV1394_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(AV1394_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT     = $(AV1394_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -90,10 +87,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -107,27 +102,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	Warlock targets
-#
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/av1394.wlcmd
-	$(WARLOCK) -c $(WLCMD_DIR)/av1394.wlcmd $(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/1394/targets/av1394/%.c
-	$(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/cmlb/Makefile b/usr/src/uts/intel/cmlb/Makefile
index 199d487524..45158fec56 100644
--- a/usr/src/uts/intel/cmlb/Makefile
+++ b/usr/src/uts/intel/cmlb/Makefile
@@ -40,8 +40,6 @@ UTSBASE	= ../..
 MODULE		= cmlb
 OBJECTS		= $(CMLB_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(CMLB_OBJS:%.o=$(LINTS_DIR)/%.ln)
-WARLOCK_OUT	= $(CMLB_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
 
 #
@@ -92,10 +90,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -109,21 +105,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-
-#
-#	Warlock targets
-#
-warlock: $(WARLOCK_OK) 
-
-$(WARLOCK_OK):	$(WARLOCK_OUT)
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
diff --git a/usr/src/uts/intel/daplt/Makefile b/usr/src/uts/intel/daplt/Makefile
index edc6de73ab..3dcf2d7e07 100644
--- a/usr/src/uts/intel/daplt/Makefile
+++ b/usr/src/uts/intel/daplt/Makefile
@@ -38,9 +38,7 @@ LINTS		= $(DAPLT_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/ib/clients/daplt
 LDFLAGS		+= -dy -Nmisc/ibtl -Nmisc/ibcm
-WARLOCK_OUT     = $(DAPLT_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
+
 #
 #	Include common rules.
 #
@@ -86,10 +84,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -103,26 +99,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#       Defines for local commands.
-#
-WARLOCK         = warlock
-WLCC            = wlcc
-TOUCH           = touch
-TEST            = test
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/daplt.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/daplt.wlcmd $(WARLOCK_OUT) \
-		-l $(UTSBASE)/intel/warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/clients/daplt/%.c \
-	$(UTSBASE)/common/sys/ib/clients/daplt/daplt.h \
-	$(UTSBASE)/common/sys/ib/clients/daplt/daplt_if.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-        
-warlock_ddi.files:
-	@cd $(UTSBASE)/intel/warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/ecpp/Makefile b/usr/src/uts/intel/ecpp/Makefile
index ad00fbee41..9352ae18bf 100644
--- a/usr/src/uts/intel/ecpp/Makefile
+++ b/usr/src/uts/intel/ecpp/Makefile
@@ -26,7 +26,7 @@
 #
 #	This Makefile drives the production of ecpp
 #	kernel module.
-#	
+#
 #
 
 #
@@ -42,9 +42,6 @@ OBJECTS		= $(ECPP_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(ECPP_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io
-WARLOCK_OUT	= $(ECPP_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -83,10 +80,8 @@ all:		$(ALL_DEPS)
 clean:		$(CLEAN_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 modlintlib:	$(MODLINTLIB_DEPS)
 
@@ -98,28 +93,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ecpp.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/ecpp.wlcmd $(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/%.c $(UTSBASE)/common/sys/ecppvar.h \
-		$(UTSBASE)/common/sys/ecppio.h
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/ehci/Makefile b/usr/src/uts/intel/ehci/Makefile
index 84340ab114..59ca760453 100644
--- a/usr/src/uts/intel/ehci/Makefile
+++ b/usr/src/uts/intel/ehci/Makefile
@@ -39,9 +39,6 @@ OBJECTS		= $(EHCI_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(EHCI_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/usb/hcd/ehci
-WARLOCK_OUT	= $(EHCI_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -74,10 +71,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -91,34 +86,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES = $(USBA_OBJS:%.o= -l ../usba/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ehci.wlcmd warlock_ddi.files \
-	usba.files
-	$(WARLOCK) -c $(WLCMD_DIR)/ehci.wlcmd  $(WARLOCK_OUT) \
-	$(USBA_FILES) \
-	-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/hcd/ehci/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
-
-usba.files:
-	@cd ../usba; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/eibnx/Makefile b/usr/src/uts/intel/eibnx/Makefile
index 790d52d56e..dfcbf6bdc7 100644
--- a/usr/src/uts/intel/eibnx/Makefile
+++ b/usr/src/uts/intel/eibnx/Makefile
@@ -42,9 +42,6 @@ OBJECTS		= $(EIBNX_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(EIBNX_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/ib/clients/eoib
-WARLOCK_OUT	= $(EIBNX_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 # Include common rules
@@ -62,9 +59,9 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 #
 CPPFLAGS += -DENX_DEBUG
 
-# 
-# Lint pass one enforcement 
-# 
+#
+# Lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -90,10 +87,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -107,34 +102,3 @@ install:	$(INSTALL_DEPS)
 # Include common targets
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-# Defines for local commands
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/eibnx.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/eibnx.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/clients/eoib/enx_main.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/enx_hdlrs.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/enx_ibt.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/enx_log.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/enx_fip.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/enx_misc.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/enx_q.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/enx_ctl.c \
-	    $(UTSBASE)/common/sys/ib/clients/eoib/fip.h \
-	    $(UTSBASE)/common/sys/ib/clients/eoib/eib.h \
-	    $(UTSBASE)/common/sys/ib/clients/eoib/enx_impl.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/eoib/Makefile b/usr/src/uts/intel/eoib/Makefile
index 0be7ddc774..f650f1eeac 100644
--- a/usr/src/uts/intel/eoib/Makefile
+++ b/usr/src/uts/intel/eoib/Makefile
@@ -41,9 +41,6 @@ MODULE		= eoib
 OBJECTS		= $(EOIB_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(EOIB_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT	= $(EOIB_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 # Include common rules
@@ -61,9 +58,9 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 #
 CPPFLAGS += -DEIB_DEBUG
 
-# 
-# Lint pass one enforcement 
-# 
+#
+# Lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 CERRWARN	+= -_gcc=-Wno-switch
@@ -84,10 +81,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -101,39 +96,3 @@ install:	$(INSTALL_DEPS)
 # Include common targets
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-# Defines for local commands
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/eoib.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/eoib.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/clients/eoib/eib_adm.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_chan.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_cmn.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_ctl.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_data.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_fip.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_ibt.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_log.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_mac.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_main.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_rsrc.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_svc.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_vnic.c \
-	    $(UTSBASE)/common/sys/ib/clients/eoib/fip.h \
-	    $(UTSBASE)/common/sys/ib/clients/eoib/eib.h \
-	    $(UTSBASE)/common/sys/ib/clients/eoib/eib_impl.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/fcip/Makefile b/usr/src/uts/intel/fcip/Makefile
index 0af2d29b95..f7187b5c4d 100644
--- a/usr/src/uts/intel/fcip/Makefile
+++ b/usr/src/uts/intel/fcip/Makefile
@@ -89,9 +89,6 @@ clobber:	$(CLOBBER_DEPS)
 
 lint:		$(LINT_DEPS)
 
-warlock:
-	@echo warlock is not supported
-
 modlintlib:	$(MODLINTLIB_DEPS)
 
 clean.lint:	$(CLEAN_LINT_DEPS)
diff --git a/usr/src/uts/intel/fcsm/Makefile b/usr/src/uts/intel/fcsm/Makefile
index c181fc205c..042e429b0b 100644
--- a/usr/src/uts/intel/fcsm/Makefile
+++ b/usr/src/uts/intel/fcsm/Makefile
@@ -88,9 +88,6 @@ clobber:	$(CLOBBER_DEPS)
 
 lint:		$(LINT_DEPS)
 
-warlock:
-	@echo warlock is not supported
-
 modlintlib:	$(MODLINTLIB_DEPS)
 
 clean.lint:	$(CLEAN_LINT_DEPS)
diff --git a/usr/src/uts/intel/hci1394/Makefile b/usr/src/uts/intel/hci1394/Makefile
index 324bfaad1e..18c4f5ed6b 100644
--- a/usr/src/uts/intel/hci1394/Makefile
+++ b/usr/src/uts/intel/hci1394/Makefile
@@ -45,9 +45,6 @@ LINTS		= $(HCI1394_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/1394/adapters
 LDFLAGS		+= -dy -Nmisc/s1394
-WARLOCK_OUT     = $(HCI1394_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -96,10 +93,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -113,34 +108,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	Warlock targets
-#
-S1394_FILES = $(S1394_OBJS:%.o= -l ../s1394/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) s1394.files warlock_ddi.files \
-	$(WLCMD_DIR)/hci1394.wlcmd
-	$(WARLOCK) -c $(WLCMD_DIR)/hci1394.wlcmd $(WARLOCK_OUT) $(S1394_FILES) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/1394/adapters/%.c
-	$(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
-
-s1394.files:
-	@cd ../s1394; pwd; $(MAKE) warlock
-
diff --git a/usr/src/uts/intel/hermon/Makefile b/usr/src/uts/intel/hermon/Makefile
index df654582e9..1949d8f6ec 100644
--- a/usr/src/uts/intel/hermon/Makefile
+++ b/usr/src/uts/intel/hermon/Makefile
@@ -44,9 +44,6 @@ LINTS		= $(HERMON_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/ib/adapters/hermon
 LDFLAGS		+= -dy -Ndrv/ib -Nmisc/ibtl -Nmisc/ibmf
-WARLOCK_OUT	= $(HERMON_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -106,25 +103,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/hermon.wlcmd
-	$(WARLOCK) -c $(WLCMD_DIR)/hermon.wlcmd $(WARLOCK_OUT) -l \
-	$(UTSBASE)/intel/warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/adapters/hermon/%.c
-	$(WLCC)  $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd $(UTSBASE)/intel/warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/hid/Makefile b/usr/src/uts/intel/hid/Makefile
index ad070dfb6d..a8b0e576d4 100644
--- a/usr/src/uts/intel/hid/Makefile
+++ b/usr/src/uts/intel/hid/Makefile
@@ -40,9 +40,6 @@ MODULE		= hid
 OBJECTS		= $(HID_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(HID_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT	= $(HID_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -86,10 +83,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -103,55 +98,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK) warlock_with_usba
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/hid.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/hid.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/clients/hid/%.c \
-		$(UTSBASE)/common/sys/usb/clients/hid/hidvar.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_with_usba: $(WLCMD_DIR)/hid_with_usba.wlcmd $(WARLOCK_OUT) usba_files \
-	ohci_files ehci_files uhci_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/hid_with_usba.wlcmd \
-		$(USBA_FILES) \
-		$(UHCI_FILES) $(OHCI_FILES) $(EHCI_FILES) \
-		$(WARLOCK_OUT) \
-	-l ../warlock/ddi_dki_impl.ll
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
-
diff --git a/usr/src/uts/intel/ib/Makefile b/usr/src/uts/intel/ib/Makefile
index b66a6ca45a..48b58d2c5f 100644
--- a/usr/src/uts/intel/ib/Makefile
+++ b/usr/src/uts/intel/ib/Makefile
@@ -42,9 +42,6 @@ OBJECTS		= $(IB_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(IB_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/ib/ibnex
-WARLOCK_OUT	= $(IB_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -64,9 +61,9 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
 CERRWARN	+= -_gcc=-Wno-uninitialized
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -94,10 +91,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -111,31 +106,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-IBDM_FILES = $(IBDM_OBJS:%.o=../ibdm/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ib.wlcmd ibdm_files
-	$(WARLOCK) -c $(WLCMD_DIR)/ib.wlcmd $(WARLOCK_OUT)  \
-		-l $(IBDM_FILES) -l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/ibnex/%.c \
-		$(UTSBASE)/common/sys/ib/ibnex/ibnex.h \
-		$(UTSBASE)/common/sys/ib/ibnex/ibnex_devctl.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-ibdm_files :
-	@cd ../ibdm; pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/ibcm/Makefile b/usr/src/uts/intel/ibcm/Makefile
index a3e573b057..16799ca83f 100644
--- a/usr/src/uts/intel/ibcm/Makefile
+++ b/usr/src/uts/intel/ibcm/Makefile
@@ -40,9 +40,6 @@ MODULE		= ibcm
 OBJECTS		= $(IBCM_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(IBCM_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT	= $(IBCM_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -60,9 +57,9 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 #	Overrides.
 #
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 CERRWARN	+= -_gcc=-Wno-switch
@@ -99,10 +96,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -116,24 +111,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#       Defines for local commands.
-#
-WARLOCK         = warlock
-WLCC            = wlcc
-TOUCH           = touch
-TEST            = test
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ibcm.wlcmd
-	$(WARLOCK) -c $(WLCMD_DIR)/ibcm.wlcmd $(WARLOCK_OUT)
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/mgt/ibcm/%.c \
-	$(UTSBASE)/common/sys/ib/mgt/ibcm/ibcm_impl.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/ibdm/Makefile b/usr/src/uts/intel/ibdm/Makefile
index c957274d71..0dca661c45 100644
--- a/usr/src/uts/intel/ibdm/Makefile
+++ b/usr/src/uts/intel/ibdm/Makefile
@@ -40,8 +40,6 @@ MODULE		= ibdm
 OBJECTS		= $(IBDM_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(IBDM_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT	= $(IBDM_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
 
 #
 #	Include common rules.
@@ -59,9 +57,9 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 #	Overrides.
 #
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -89,10 +87,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -106,23 +102,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-warlock: $(WARLOCK_OK)
-
-
-$(WARLOCK_OK): $(WARLOCK_OUT) 
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/mgt/ibdm/%.c \
-		$(UTSBASE)/common/sys/ib/mgt/ibdm/ibdm_impl.h \
-		$(UTSBASE)/common/sys/ib/mgt/ibdm/ibdm_ibnex.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
diff --git a/usr/src/uts/intel/ibdma/Makefile b/usr/src/uts/intel/ibdma/Makefile
index 0450822478..8b5cb96982 100644
--- a/usr/src/uts/intel/ibdma/Makefile
+++ b/usr/src/uts/intel/ibdma/Makefile
@@ -40,8 +40,6 @@ MODULE		= ibdma
 OBJECTS		= $(IBDMA_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(IBDMA_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT	= $(IBDMA_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
 
 #
 #	Include common rules.
@@ -59,9 +57,9 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 #	Overrides.
 #
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -87,10 +85,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -104,23 +100,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-warlock: $(WARLOCK_OK)
-
-
-$(WARLOCK_OK): $(WARLOCK_OUT) 
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/mgt/ibdma/%.c \
-		$(UTSBASE)/common/sys/ib/mgt/ibdma/ibdma_impl.h \
-		$(UTSBASE)/common/sys/ib/mgt/ibdma/ibdma.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
diff --git a/usr/src/uts/intel/ibmf/Makefile b/usr/src/uts/intel/ibmf/Makefile
index ddb162da36..6a8efa3937 100644
--- a/usr/src/uts/intel/ibmf/Makefile
+++ b/usr/src/uts/intel/ibmf/Makefile
@@ -41,9 +41,7 @@ OBJECTS		= $(IBMF_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(IBMF_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
 LDFLAGS		+= -dy -Nmisc/ibtl
-WARLOCK_OUT	= $(IBMF_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
+
 #
 #	Include common rules.
 #
@@ -62,9 +60,9 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 #DEBUG_DEFS_DBG32 += -DTNF_DEBUG
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -87,10 +85,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -104,27 +100,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-TEST		= test
-
-#
-#	Warlock targets
-#
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/ibmf.wlcmd
-	$(WARLOCK) -c $(WLCMD_DIR)/ibmf.wlcmd $(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/mgt/ibmf/%.c
-	$(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/ibp/Makefile b/usr/src/uts/intel/ibp/Makefile
index 7496199be8..f9525a17d2 100644
--- a/usr/src/uts/intel/ibp/Makefile
+++ b/usr/src/uts/intel/ibp/Makefile
@@ -38,9 +38,7 @@ ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/ib/clients/ibd
 LDFLAGS		+= -dy -Nmisc/mac -Nmisc/ibtl -Nmisc/ibcm -Nmisc/ibmf -Ndrv/ip \
 		-Nmisc/dls -Ndrv/dld
-WARLOCK_OUT	= $(IBD_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
+
 #
 #	Include common rules.
 #
@@ -74,10 +72,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -91,25 +87,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#       Defines for local commands.
-#
-WARLOCK         = warlock
-WLCC            = wlcc
-TOUCH           = touch
-TEST            = test
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ibd.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/ibd.wlcmd $(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/clients/ibd/%.c \
-	$(UTSBASE)/common/sys/ib/clients/ibd/ibd.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/ibtl/Makefile b/usr/src/uts/intel/ibtl/Makefile
index 26cbb7ee6d..ecf5bdd849 100644
--- a/usr/src/uts/intel/ibtl/Makefile
+++ b/usr/src/uts/intel/ibtl/Makefile
@@ -41,9 +41,6 @@ MODULE		= ibtl
 OBJECTS		= $(IBTL_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(IBTL_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT    = $(IBTL_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -93,10 +90,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -110,24 +105,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK         = warlock
-WLCC            = wlcc
-TOUCH           = touch
-TEST            = test
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/ibtl.wlcmd
-	$(WARLOCK) -c $(WLCMD_DIR)/ibtl.wlcmd $(WARLOCK_OUT) -l \
-	../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/ibtl/%.c
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/mii/Makefile b/usr/src/uts/intel/mii/Makefile
index 49071a070e..7f2167f18c 100644
--- a/usr/src/uts/intel/mii/Makefile
+++ b/usr/src/uts/intel/mii/Makefile
@@ -39,9 +39,6 @@ MODULE		= mii
 OBJECTS		= $(MII_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(MII_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT	= $(MII_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -70,10 +67,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
diff --git a/usr/src/uts/intel/mpt_sas/Makefile b/usr/src/uts/intel/mpt_sas/Makefile
index 01dd2e2da4..d0d809c3b5 100644
--- a/usr/src/uts/intel/mpt_sas/Makefile
+++ b/usr/src/uts/intel/mpt_sas/Makefile
@@ -39,9 +39,6 @@ OBJECTS		= $(MPTSAS_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(MPTSAS_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/scsi/adapters/mpt_sas/
-WARLOCK_OUT     = $(MPTSAS_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Kernel Module Dependencies
@@ -74,10 +71,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -91,36 +86,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-SCSI_FILES = $(SCSI_OBJS:%.o= -l $(UTSBASE)/intel/scsi/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files scsi.files \
-	$(WLCMD_DIR)/mptsas.wlcmd
-	$(WARLOCK) -c $(WLCMD_DIR)/mptsas.wlcmd $(WARLOCK_OUT) \
-	$(SCSI_FILES) \
-	$(UTSBASE)/intel/warlock/scsi.ll \
-	-l $(UTSBASE)/intel/warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/scsi/adapters/mpt_sas/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd $(UTSBASE)/intel/warlock; pwd; $(MAKE) warlock
-
-scsi.files:
-	@cd $(UTSBASE)/intel/scsi; pwd; $(MAKE) warlock
-
diff --git a/usr/src/uts/intel/nulldriver/Makefile b/usr/src/uts/intel/nulldriver/Makefile
index 96ca163261..1f2891ea3d 100644
--- a/usr/src/uts/intel/nulldriver/Makefile
+++ b/usr/src/uts/intel/nulldriver/Makefile
@@ -79,9 +79,6 @@ clobber:	$(CLOBBER_DEPS)
 
 lint:		$(LINT_DEPS)
 
-warlock:
-	@echo warlock is not supported
-
 modlintlib:	$(MODLINTLIB_DEPS)
 
 clean.lint:	$(CLEAN_LINT_DEPS)
diff --git a/usr/src/uts/intel/nv_sata/Makefile b/usr/src/uts/intel/nv_sata/Makefile
index 17f12c4fcd..9723cca3cc 100644
--- a/usr/src/uts/intel/nv_sata/Makefile
+++ b/usr/src/uts/intel/nv_sata/Makefile
@@ -36,9 +36,6 @@ OBJECTS		= $(NV_SATA_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(NV_SATA_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR     = $(UTSBASE)/common/io/sata/adapters/nv_sata
-WARLOCK_OUT     = $(NV_SATA_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -61,7 +58,7 @@ CPPFLAGS	+= -DSGPIO_SUPPORT
 
 #
 # lint pass one enforcement
-#  
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -74,7 +71,7 @@ LDFLAGS += -dy -N misc/sata
 # to investigate and remove these for maximum lint coverage.
 # Please do not carry these forward to new Makefiles.
 #
-LINTTAGS        += -erroff=E_BAD_PTR_CAST_ALIGN 
+LINTTAGS        += -erroff=E_BAD_PTR_CAST_ALIGN
 
 CERRWARN	+= -_gcc=-Wno-uninitialized
 
@@ -88,10 +85,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -105,49 +100,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-NV_SATA_FILES   = $(MODULE).ll
-SD_FILES = $(SD_OBJS:%.o=../sd/%.ll)
-SATA_FILES = $(SATA_OBJS:%.o=-l ../sata/%.ll)
-SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
-CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll)
- 
-warlock: $(WARLOCK_OK)
-
-
-$(WARLOCK_OK): $(WLCMD_DIR)/nv_sata.wlcmd $(WARLOCK_OUT)  warlock_ddi.files \
-	sata.files scsi.files sd.files cmlb.files
-	$(WARLOCK) -c $(WLCMD_DIR)/nv_sata.wlcmd $(WARLOCK_OUT) \
-	$(SD_FILES) \
-	$(SCSI_FILES) \
-	$(CMLB_FILES) \
-        $(SATA_FILES) \
-	-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/sata/adapters/nv_sata/%.c
-	$(WLCC) $(CPPFLAGS) -D DEBUG -o $@ $<
-
-sata.files:
-	@cd ../sata; pwd; $(MAKE) warlock
- 
-scsi.files:
-	@cd ../scsi; pwd; $(MAKE) warlock
-
-sd.files: 
-	@cd ../sd; pwd; $(MAKE) warlock_alone
-
-cmlb.files:
-	@cd ../cmlb; pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/ohci/Makefile b/usr/src/uts/intel/ohci/Makefile
index afd68d8540..39068183bc 100644
--- a/usr/src/uts/intel/ohci/Makefile
+++ b/usr/src/uts/intel/ohci/Makefile
@@ -37,11 +37,8 @@ UTSBASE	= ../..
 MODULE		= ohci
 OBJECTS		= $(OHCI_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(OHCI_OBJS:%.o=$(LINTS_DIR)/%.ln)
-WARLOCK_OUT	= $(OHCI_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/usb/hcd/openhci
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -79,10 +76,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -96,33 +91,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES = $(USBA_OBJS:%.o= -l ../usba/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-ohci.ok: $(WARLOCK_OUT) $(WLCMD_DIR)/ohci.wlcmd warlock_ddi.files usba.files
-	$(WARLOCK) -c $(WLCMD_DIR)/ohci.wlcmd  $(WARLOCK_OUT) \
-	$(USBA_FILES)  \
-	-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/hcd/openhci/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
-
-usba.files:
-	@cd ../usba; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/pmcs/Makefile b/usr/src/uts/intel/pmcs/Makefile
index 31500be02f..3bc177d9cf 100644
--- a/usr/src/uts/intel/pmcs/Makefile
+++ b/usr/src/uts/intel/pmcs/Makefile
@@ -39,9 +39,6 @@ OBJECTS		= $(PMCS_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(PMCS_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/scsi/adapters/pmcs
-WARLOCK_OUT     = $(PMCS_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Kernel Module Dependencies
diff --git a/usr/src/uts/intel/s1394/Makefile b/usr/src/uts/intel/s1394/Makefile
index 0efc9bdc25..aa1961414b 100644
--- a/usr/src/uts/intel/s1394/Makefile
+++ b/usr/src/uts/intel/s1394/Makefile
@@ -43,9 +43,6 @@ MODULE		= s1394
 OBJECTS		= $(S1394_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(S1394_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT     = $(S1394_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/sparc/$(MODULE)
 
 #
 #	Include common rules.
@@ -96,10 +93,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -113,23 +108,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-
-#
-#	Warlock targets
-#
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/1394/%.c
-	$(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/sata/Makefile b/usr/src/uts/intel/sata/Makefile
index c9f86f8c11..9d4e9bb2fc 100644
--- a/usr/src/uts/intel/sata/Makefile
+++ b/usr/src/uts/intel/sata/Makefile
@@ -45,8 +45,6 @@ MODULE		= sata
 OBJECTS		= $(SATA_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(SATA_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT     = $(SATA_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
 
 #
 #	Include common rules.
@@ -103,10 +101,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -120,21 +116,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#       Defines for local commands.
-#
-WLCC            = wlcc
-TOUCH           = touch
-WARLOCK         = warlock
-
-#
-#       Warlock targets
-#
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK):   $(WARLOCK_OUT)
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/sata/impl/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
diff --git a/usr/src/uts/intel/sbp2/Makefile b/usr/src/uts/intel/sbp2/Makefile
index 58f728a1d1..26d2f46fb9 100644
--- a/usr/src/uts/intel/sbp2/Makefile
+++ b/usr/src/uts/intel/sbp2/Makefile
@@ -39,9 +39,6 @@ MODULE		= sbp2
 OBJECTS		= $(SBP2_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(SBP2_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT     = $(SBP2_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -74,10 +71,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -91,25 +86,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-
-#
-#	Warlock
-#
-WARLOCK_CMD	= $(WLCMD_DIR)/$(MODULE).wlcmd
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK):	$(WARLOCK_OUT) $(WARLOCK_CMD)
-	$(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/sbp2/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
diff --git a/usr/src/uts/intel/scsa1394/Makefile b/usr/src/uts/intel/scsa1394/Makefile
index 18555118ca..8e07952219 100644
--- a/usr/src/uts/intel/scsa1394/Makefile
+++ b/usr/src/uts/intel/scsa1394/Makefile
@@ -35,9 +35,6 @@ MODULE		= scsa1394
 OBJECTS		= $(SCSA1394_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(SCSA1394_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT     = $(SCSA1394_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -77,10 +74,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -94,49 +89,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	Warlock targets
-#
-SBP2_FILES = $(SBP2_OBJS:%.o= -l ../sbp2/%.ll)
-SD_FILES   = $(SD_OBJS:%.o=../sd/%.ll)
-SCSI_FILES = $(SCSI_OBJS:%.o= -l ../scsi/%.ll)
-CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) sbp2.files warlock_ddi.files \
-	$(WLCMD_DIR)/scsa1394.wlcmd sd.files scsi.files cmlb.files
-	$(WARLOCK) -c $(WLCMD_DIR)/scsa1394.wlcmd $(WARLOCK_OUT) $(SD_FILES) \
-		$(SCSI_FILES) \
-		$(CMLB_FILES) \
-		$(SBP2_FILES) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/1394/targets/scsa1394/%.c
-	$(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $<
-
-sbp2.files:
-	@cd ../sbp2; pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
-
-sd.files:
-	@cd ../sd; pwd; $(MAKE) warlock_alone
-
-scsi.files:
-	@cd ../scsi; pwd; $(MAKE) warlock
-
-cmlb.files:
-	@cd ../cmlb; pwd; $(MAKE) warlock
-
diff --git a/usr/src/uts/intel/scsa2usb/Makefile b/usr/src/uts/intel/scsa2usb/Makefile
index 8562d9231e..61acb5215e 100644
--- a/usr/src/uts/intel/scsa2usb/Makefile
+++ b/usr/src/uts/intel/scsa2usb/Makefile
@@ -42,9 +42,6 @@ OBJECTS		= $(SCSA2USB_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(SCSA2USB_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/usb/scsa2usb
-WARLOCK_OUT	= $(SCSA2USB_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -89,10 +86,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -106,79 +101,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-SD_FILES   = $(SD_OBJS:%.o=../sd/%.ll)
-ST_FILES   = $(ST_OBJS:%.o=../st/%.ll)
-SCSI_FILES = $(SCSI_OBJS:%.o= -l ../scsi/%.ll)
-CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll)
-
-warlock: $(WARLOCK_OK) warlock_with_usba
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/scsa2usb.wlcmd warlock_ddi.files \
-	scsi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/scsa2usb.wlcmd $(WARLOCK_OUT)  \
-		../warlock/scsi.ll \
-		$(SCSI_FILES) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/scsa2usb/%.c \
-		$(UTSBASE)/common/sys/usb/clients/mass_storage/usb_bulkonly.h \
-		$(UTSBASE)/common/sys/usb/clients/mass_storage/usb_cbi.h \
-		$(UTSBASE)/common/sys/usb/scsa2usb/scsa2usb.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_with_usba: $(WLCMD_DIR)/scsa2usb_with_usba.wlcmd \
-	$(WARLOCK_OUT) usba_files \
-	ohci_files ehci_files uhci_files warlock_ddi.files sd.files st.files \
-	cmlb.files scsi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/scsa2usb_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(SD_FILES) \
-		$(ST_FILES) \
-		$(CMLB_FILES) \
-		$(SCSI_FILES) \
-		$(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
-
-scsi.files:
-	@cd ../scsi; pwd; $(MAKE) warlock
-
-sd.files:
-	@cd ../sd; pwd; $(MAKE) warlock_alone
-
-st.files:
-	@cd ../st; pwd; $(MAKE) warlock_alone
-
-cmlb.files:
-	 @cd ../cmlb; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/scsi/Makefile b/usr/src/uts/intel/scsi/Makefile
index f4b8ec262c..5aeaf4c0f1 100644
--- a/usr/src/uts/intel/scsi/Makefile
+++ b/usr/src/uts/intel/scsi/Makefile
@@ -43,9 +43,6 @@ MODULE		= scsi
 OBJECTS		= $(SCSI_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(SCSI_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT     = $(SCSI_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/sparc/$(MODULE)
 
 #
 #	Include common rules.
@@ -88,10 +85,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -105,23 +100,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-
-#
-#	Warlock targets
-#
-warlock: $(MODULE).ok
-
-%.ok: $(WARLOCK_OUT)
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/scsi/impl/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-%.ll: $(UTSBASE)/common/io/scsi/conf/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
diff --git a/usr/src/uts/intel/sd/Makefile b/usr/src/uts/intel/sd/Makefile
index 90e10840c1..cfa86ca4e5 100644
--- a/usr/src/uts/intel/sd/Makefile
+++ b/usr/src/uts/intel/sd/Makefile
@@ -42,9 +42,6 @@ OBJECTS		= $(SD_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(SD_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/intel/io/scsi/targets
-WARLOCK_OUT     = $(SD_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -92,10 +89,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -109,48 +104,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-# Warlock targets
-#
-# Note that in warlock_with_{esp,isp} it is important to load sd.ll
-# before {isp,esp}.ll; the reason is that both have _init/_info/_fini
-# and warlock can only handle one extern function by a given name;
-# any loaded after the first are ignored.
-
-SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
-CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll)
-
-WARLOCK_TARGETS = warlock_alone
-
-warlock: $(WARLOCK_TARGETS)
-
-warlock_alone: $(WARLOCK_OK)
-
-$(WARLOCK_OK):	$(WLCMD_DIR)/sd.wlcmd $(WARLOCK_OUT) scsi_files \
-	warlock_ddi.files cmlb_files
-	$(WARLOCK) -c $(WLCMD_DIR)/sd.wlcmd $(WARLOCK_OUT) $(SCSI_FILES) \
-		$(CMLB_FILES) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/scsi/targets/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-cmlb_files:
-	@cd ../cmlb; pwd; $(MAKE) warlock
-
-scsi_files:
-	@cd ../scsi; pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/ses/Makefile b/usr/src/uts/intel/ses/Makefile
index f1b4243862..a0e45fb059 100644
--- a/usr/src/uts/intel/ses/Makefile
+++ b/usr/src/uts/intel/ses/Makefile
@@ -44,9 +44,6 @@ OBJECTS		= $(SES_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(SES_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/intel/io/scsi/targets
-WARLOCK_OUT     = $(SES_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -59,7 +56,6 @@ include $(UTSBASE)/intel/Makefile.intel
 ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
 LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
-CLEANFILES	+= $(WARLOCK_TARGETS)
 
 #
 # For now, disable these lint checks; maintainers should endeavor
@@ -84,10 +80,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -101,40 +95,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-
-#
-# Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-# Warlock targets
-#
-SCSI_FILES	= $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
-
-WARLOCK_TARGETS	= $(WARLOCK_OK)
-
-warlock: $(WARLOCK_TARGETS)
-
-# XXX FIX ME: why only ses.ll?
-
-$(WARLOCK_OK): $(WLCMD_DIR)/$(MODULE).wlcmd $(WARLOCK_OUT)
-	@cd ../warlock; $(MAKE) warlock
-	@cd ../scsi; $(MAKE) warlock
-	$(WARLOCK) -c $(WLCMD_DIR)/$(MODULE).wlcmd ses.ll \
-		../warlock/scsi.ll \
-	        -l ../warlock/ddi_dki_impl.ll  \
-	        $(SCSI_FILES)
-	@ $(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/scsi/targets/%.c
-	$(WLCC) $(CPPFLAGS) -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
-
-
diff --git a/usr/src/uts/intel/si3124/Makefile b/usr/src/uts/intel/si3124/Makefile
index 813a7b9011..b778602e28 100644
--- a/usr/src/uts/intel/si3124/Makefile
+++ b/usr/src/uts/intel/si3124/Makefile
@@ -26,7 +26,7 @@
 #
 
 #
-#	This makefile drives the production of the 
+#	This makefile drives the production of the
 #	"platform/i86pc/kernel/drv/si3124" kernel module.
 #
 #	intel architecture dependent
@@ -45,9 +45,6 @@ OBJECTS		= $(SI3124_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(SI3124_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR     = $(UTSBASE)/common/io/sata/adapters/si3124
-WARLOCK_OUT     = $(SI3124_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -71,7 +68,7 @@ CERRWARN	+= -_gcc=-Wno-uninitialized
 
 #
 # lint pass one enforcement
-#  
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -89,10 +86,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -106,48 +101,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-SI3124_FILES   = $(MODULE).ll
-SD_FILES = $(SD_OBJS:%.o=../sd/%.ll)
-SATA_FILES = $(SATA_OBJS:%.o=-l ../sata/%.ll)
-SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
-CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WLCMD_DIR)/si3124.wlcmd $(WARLOCK_OUT) warlock_ddi.files \
-	sata.files scsi.files sd.files cmlb.files
-	$(WARLOCK) -c $(WLCMD_DIR)/si3124.wlcmd $(WARLOCK_OUT) \
-	$(SD_FILES) \
-	$(SCSI_FILES) \
-	$(CMLB_FILES) \
-        $(SATA_FILES) \
-	-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/sata/adapters/si3124/%.c
-	$(WLCC) $(CPPFLAGS) -D DEBUG -o $@ $<
-
-sata.files:
-	@cd ../sata; pwd; $(MAKE) warlock
- 
-scsi.files:
-	@cd ../scsi; pwd; $(MAKE) warlock
-
-sd.files: 
-	@cd ../sd; pwd; $(MAKE) warlock_alone
-
-cmlb.files:
-	@cd ../cmlb; pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/sol_ofs/Makefile b/usr/src/uts/intel/sol_ofs/Makefile
index e83b128b6e..8f1e756ee3 100644
--- a/usr/src/uts/intel/sol_ofs/Makefile
+++ b/usr/src/uts/intel/sol_ofs/Makefile
@@ -36,9 +36,7 @@ OBJECTS		= $(SOL_OFS_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(SOL_OFS_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
 LDFLAGS		+= -dy -Nmisc/ibtl -Nmisc/ibcm
-WARLOCK_OUT	= $(SOL_OFS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
+
 #
 #	Include common rules.
 #
@@ -76,10 +74,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -93,25 +89,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#       Defines for local commands.
-#
-WARLOCK         = warlock
-WLCC            = wlcc
-TOUCH           = touch
-TEST            = test
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/sol_ofs.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/sol_ofs.wlcmd $(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/clients/of/sol_ofs/%.c \
-	$(UTSBASE)/common/sys/ib/clients/of/sol_ofs/sol_uverbs.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/sol_ucma/Makefile b/usr/src/uts/intel/sol_ucma/Makefile
index 6bdde86210..4b51aae13c 100644
--- a/usr/src/uts/intel/sol_ucma/Makefile
+++ b/usr/src/uts/intel/sol_ucma/Makefile
@@ -37,9 +37,7 @@ LINTS		= $(SOL_UCMA_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 LDFLAGS		+= -dy -Nmisc/sol_ofs
 CONF_SRCDIR	= $(UTSBASE)/common/io/ib/clients/of/sol_ucma
-WARLOCK_OUT	= $(SOL_UCMA:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
+
 #
 #	Include common rules.
 #
@@ -76,10 +74,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -93,25 +89,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#       Defines for local commands.
-#
-WARLOCK         = warlock
-WLCC            = wlcc
-TOUCH           = touch
-TEST            = test
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/sol_ucma.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/sol_ucma.wlcmd $(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/clients/of/sol_ucma/%.c \
-	$(UTSBASE)/common/sys/ib/clients/of/sol_ucma/sol_ucma.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/sol_uverbs/Makefile b/usr/src/uts/intel/sol_uverbs/Makefile
index 0e913dd524..548d80aad3 100644
--- a/usr/src/uts/intel/sol_uverbs/Makefile
+++ b/usr/src/uts/intel/sol_uverbs/Makefile
@@ -37,9 +37,7 @@ LINTS		= $(SOL_UVERBS_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 LDFLAGS		+= -dy -Nmisc/ibtl -Nmisc/sol_ofs
 CONF_SRCDIR	= $(UTSBASE)/common/io/ib/clients/of/sol_uverbs
-WARLOCK_OUT	= $(SOL_UVERBS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
+
 #
 #	Include common rules.
 #
@@ -76,10 +74,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -93,25 +89,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#       Defines for local commands.
-#
-WARLOCK         = warlock
-WLCC            = wlcc
-TOUCH           = touch
-TEST            = test
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/sol_uverbs.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/sol_uverbs.wlcmd $(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/clients/of/sol_uverbs/%.c \
-	$(UTSBASE)/common/sys/ib/clients/of/sol_uverbs/sol_uverbs.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-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 078d5a3796..96ec74eb2f 100644
--- a/usr/src/uts/intel/st/Makefile
+++ b/usr/src/uts/intel/st/Makefile
@@ -43,9 +43,6 @@ OBJECTS		= $(ST_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(ST_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/intel/io/scsi/targets
-WARLOCK_OUT     = $(ST_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -93,10 +90,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -110,41 +105,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-# Warlock targets
-#
-
-SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
-
-WARLOCK_TARGETS = warlock_alone
-
-warlock: $(WARLOCK_TARGETS)
-
-warlock_alone: $(WARLOCK_OK)
-
-scsi_files:
-	@cd ../scsi; pwd; $(MAKE) warlock
-
-$(WARLOCK_OK): 	$(WLCMD_DIR)/st.wlcmd $(WARLOCK_OUT) scsi_files \
-	warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/st.wlcmd $(WARLOCK_OUT) $(SCSI_FILES) \
-	-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/scsi/targets/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
-
-scsi.files:
-	@cd ../scsi; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/tavor/Makefile b/usr/src/uts/intel/tavor/Makefile
index bf51bf8a59..fd0923b3c8 100644
--- a/usr/src/uts/intel/tavor/Makefile
+++ b/usr/src/uts/intel/tavor/Makefile
@@ -44,9 +44,6 @@ LINTS		= $(TAVOR_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/ib/adapters/tavor
 LDFLAGS		+= -dy -Ndrv/ib -Nmisc/ibtl -Nmisc/ibmf
-WARLOCK_OUT    	= $(TAVOR_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -99,10 +96,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -116,25 +111,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-
-#
-#	Defines for local commands.
-#
-WARLOCK         = warlock
-WLCC            = wlcc
-TOUCH           = touch
-TEST            = test
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/tavor.wlcmd
-	$(WARLOCK) -c $(WLCMD_DIR)/tavor.wlcmd $(WARLOCK_OUT) -l \
-	$(UTSBASE)/intel/warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/adapters/tavor/%.c
-	$(WLCC)  $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd $(UTSBASE)/intel/warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/tem/Makefile b/usr/src/uts/intel/tem/Makefile
index 1d877e2259..bfeecb298b 100644
--- a/usr/src/uts/intel/tem/Makefile
+++ b/usr/src/uts/intel/tem/Makefile
@@ -40,9 +40,6 @@ MODULE		= tem
 OBJECTS		= $(TEM_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(TEM_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT	= $(TEM_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -93,26 +90,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands
-#
-TEST		= test
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-
-#
-#	warlock targets
-#
-
-warlock:	$(WARLOCK_OUT) warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/tem.wlcmd $(WARLOCK_OUT) \
-	-l ../../intel/warlock/ddi_dki_impl.ll
-	$(TOUCH) $(WARLOCK_OK)
-
-%.ll:	$(UTSBASE)/common/io/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../../intel/warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/ugen/Makefile b/usr/src/uts/intel/ugen/Makefile
index a56d9c759e..9c910827f1 100644
--- a/usr/src/uts/intel/ugen/Makefile
+++ b/usr/src/uts/intel/ugen/Makefile
@@ -41,9 +41,6 @@ MODULE		= ugen
 OBJECTS		= $(UGEN_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(UGEN_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT     = $(UGEN_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -74,10 +71,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -91,52 +86,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK)  warlock_with_usba
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ugen.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/ugen.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/clients/ugen/%.c \
-		$(UTSBASE)/common/sys/usb/clients/ugen/ugend.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_with_usba: $(WLCMD_DIR)/ugen_with_usba.wlcmd $(WARLOCK_OUT) usba_files \
-	ohci_files ehci_files uhci_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/ugen_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(WARLOCK_OUT) \
-	-l ../warlock/ddi_dki_impl.ll
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/uhci/Makefile b/usr/src/uts/intel/uhci/Makefile
index 7b61ccf155..c8b5992927 100644
--- a/usr/src/uts/intel/uhci/Makefile
+++ b/usr/src/uts/intel/uhci/Makefile
@@ -40,9 +40,6 @@ OBJECTS		= $(UHCI_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(UHCI_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/usb/hcd/uhci
-WARLOCK_OUT	= $(UHCI_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -86,10 +83,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -103,34 +98,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES = $(USBA_OBJS:%.o= -l ../usba/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/uhci.wlcmd warlock_ddi.files \
-	usba.files
-	$(WARLOCK) -c $(WLCMD_DIR)/uhci.wlcmd  $(WARLOCK_OUT) \
-	$(USBA_FILES) \
-	-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/hcd/uhci/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
-
-usba.files:
-	@cd ../usba; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/usb_ac/Makefile b/usr/src/uts/intel/usb_ac/Makefile
index c35c2daa99..f2852a17c0 100644
--- a/usr/src/uts/intel/usb_ac/Makefile
+++ b/usr/src/uts/intel/usb_ac/Makefile
@@ -44,9 +44,6 @@ OBJECTS		= $(USB_AC_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USB_AC_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/usb/clients/audio/usb_ac
-WARLOCK_OUT	= $(USB_AC_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -86,10 +83,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -103,58 +98,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES	= $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES	= $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES	= $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES	= $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-
-#
-#	Warlock targets
-#
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK):	$(WARLOCK_OUT) warlock_ddi.files \
-	warlock_standalone warlock_usba.files warlock_with_usba
-	$(TOUCH) $(WARLOCK_OK)
-
-warlock_with_usba: $(WLCMD_DIR)/usb_ac_with_usba.wlcmd  $(WARLOCK_OUT) \
-	warlock_ddi.files warlock_usba.files warlock_ohci.files \
-	warlock_ehci.files warlock_uhci.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usb_ac_with_usba.wlcmd \
-	$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-	$(WARLOCK_OUT)  -l ../warlock/ddi_dki_impl.ll
-
-warlock_standalone: $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/usb_ac.wlcmd
-	$(WARLOCK) -c $(WLCMD_DIR)/usb_ac.wlcmd $(WARLOCK_OUT) \
-	-l ../warlock/ddi_dki_impl.ll
-
-%.ll: $(UTSBASE)/common/io/usb/clients/audio/usb_ac/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_usba.files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-warlock_ohci.files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-warlock_uhci.files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-warlock_ehci.files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/usb_ah/Makefile b/usr/src/uts/intel/usb_ah/Makefile
index 6a3e43f1cf..a9984f9399 100644
--- a/usr/src/uts/intel/usb_ah/Makefile
+++ b/usr/src/uts/intel/usb_ah/Makefile
@@ -41,9 +41,6 @@ MODULE		= usb_ah
 OBJECTS		= $(USB_AH_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USB_AH_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_STRMOD_DIR)/$(MODULE)
-WARLOCK_OUT	= $(USB_AH_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -87,10 +84,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -104,28 +99,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usb_ah.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usb_ah.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/clients/audio/usb_ah/%.c \
-		$(UTSBASE)/common/sys/usb/clients/audio/usb_ah/usb_ah.h
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/usb_as/Makefile b/usr/src/uts/intel/usb_as/Makefile
index 3973a5b4df..a2b03b11e7 100644
--- a/usr/src/uts/intel/usb_as/Makefile
+++ b/usr/src/uts/intel/usb_as/Makefile
@@ -43,9 +43,6 @@ MODULE		= usb_as
 OBJECTS		= $(USB_AS_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USB_AS_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT	= $(USB_AS_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -86,10 +83,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -103,58 +98,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USB_AS_FILES	= $(MODULE).ll
-USBA_FILES	= $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES	= $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES	= $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES	= $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-#	Warlock targets
-#
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK):	$(WARLOCK_OUT) warlock_ddi.files \
-	warlock_standalone warlock_usba.files warlock_with_usba
-	$(TOUCH) $(WARLOCK_OK)
-
-
-warlock_with_usba: $(WLCMD_DIR)/usb_as_with_usba.wlcmd  $(WARLOCK_OUT) \
-	warlock_ddi.files warlock_ohci.files warlock_usba.files \
-	warlock_ehci.files warlock_uhci.files 
-	$(WARLOCK) -c $(WLCMD_DIR)/usb_as_with_usba.wlcmd \
-	$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-	$(WARLOCK_OUT)  -l ../warlock/ddi_dki_impl.ll
-
-warlock_standalone: $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/usb_as.wlcmd
-	$(WARLOCK) -c $(WLCMD_DIR)/usb_as.wlcmd $(WARLOCK_OUT) \
-	-l ../warlock/ddi_dki_impl.ll
-
-%.ll: $(UTSBASE)/common/io/usb/clients/audio/usb_as/%.c
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_usba.files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-warlock_ohci.files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-warlock_uhci.files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-warlock_ehci.files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/usb_ia/Makefile b/usr/src/uts/intel/usb_ia/Makefile
index 97c37f7e3e..5cb2c86e7a 100644
--- a/usr/src/uts/intel/usb_ia/Makefile
+++ b/usr/src/uts/intel/usb_ia/Makefile
@@ -40,9 +40,6 @@ MODULE		= usb_ia
 OBJECTS		= $(USB_IA_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USB_IA_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT	= $(USB_IA_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -77,10 +74,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -94,52 +89,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK) warlock_with_usba
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usb_ia.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usb_ia.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/usb_ia/%.c \
-		$(UTSBASE)/common/sys/usb/usb_ia/usb_iavar.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_with_usba: $(WLCMD_DIR)/usb_ia_with_usba.wlcmd $(WARLOCK_OUT) \
-	usba_files ohci_files ehci_files uhci_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usb_ia_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/usb_mid/Makefile b/usr/src/uts/intel/usb_mid/Makefile
index ff5fe23bab..67e5a49dd0 100644
--- a/usr/src/uts/intel/usb_mid/Makefile
+++ b/usr/src/uts/intel/usb_mid/Makefile
@@ -40,9 +40,6 @@ MODULE		= usb_mid
 OBJECTS		= $(USB_MID_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USB_MID_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT	= $(USB_MID_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -77,10 +74,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -94,52 +89,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK) warlock_with_usba
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usb_mid.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usb_mid.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/usb_mid/%.c \
-		$(UTSBASE)/common/sys/usb/usb_mid/usb_midvar.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_with_usba: $(WLCMD_DIR)/usb_mid_with_usba.wlcmd $(WARLOCK_OUT) \
-	usba_files ohci_files ehci_files uhci_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usb_mid_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/usba/Makefile b/usr/src/uts/intel/usba/Makefile
index 0b11d372fc..fbd834917a 100644
--- a/usr/src/uts/intel/usba/Makefile
+++ b/usr/src/uts/intel/usba/Makefile
@@ -39,8 +39,6 @@ MODULE		= usba
 OBJECTS		= $(USBA_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USBA_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT	= $(USBA_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
 
 #
 #	Include common rules.
@@ -71,10 +69,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -88,21 +84,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-
-#
-#	Warlock targets
-#
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK):	$(WARLOCK_OUT)
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/usba/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
diff --git a/usr/src/uts/intel/usbecm/Makefile b/usr/src/uts/intel/usbecm/Makefile
index b1f761dfa6..3ee8f01ef6 100644
--- a/usr/src/uts/intel/usbecm/Makefile
+++ b/usr/src/uts/intel/usbecm/Makefile
@@ -39,9 +39,6 @@ MODULE		= usbecm
 OBJECTS		= $(USBECM_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USBECM_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT	= $(USBECM_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -64,10 +61,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -81,53 +76,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-TEST		= test
-
-#
-#	warlock
-#
-WARLOCK_CMD	= $(WLCMD_DIR)/$(MODULE).wlcmd
-
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK) warlock_with_usba
-
-%.ll: $(UTSBASE)/common/io/usb/clients/usbecm/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usbecm.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbecm.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-warlock_with_usba: $(WLCMD_DIR)/usbecm_with_usba.wlcmd $(WARLOCK_OUT) \
-	usba_files ohci_files uhci_files ehci_files \
-	warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbecm_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/usbftdi/Makefile b/usr/src/uts/intel/usbftdi/Makefile
index c4521f48f4..4f9da61490 100644
--- a/usr/src/uts/intel/usbftdi/Makefile
+++ b/usr/src/uts/intel/usbftdi/Makefile
@@ -38,11 +38,8 @@ UTSBASE	= ../..
 MODULE		= usbftdi
 OBJECTS		= $(USBFTDI_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USBFTDI_OBJS:%.o=$(LINTS_DIR)/%.ln)
-WARLOCK_OUT     = $(USBFTDI_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/usb/clients/usbser/usbftdi
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -67,10 +64,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -84,60 +79,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-TEST		= test
-
-#
-#	warlock
-#
-WARLOCK_CMD	= $(WLCMD_DIR)/$(MODULE).wlcmd
-USBSER_FILES = $(USBSER_OBJS:%.o=../usbser/%.ll)
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): warlock_with_usba warlock_with_usbser
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/clients/usbser/usbftdi/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_with_usbser: $(WARLOCK_OUT) usbser_files warlock_ddi.files \
-	$(WARLOCK_CMD)
-	$(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \
-		$(USBSER_FILES) -l ../warlock/ddi_dki_impl.ll
-
-warlock_with_usba:  $(WARLOCK_OUT) usbser_files \
-	$(WLCMD_DIR)/usbftdi_with_usba.wlcmd usba_files ohci_files uhci_files \
-	ehci_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbftdi_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(USBSER_FILES) \
-		$(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll
-
-usbser_files:
-	@cd ../usbser; pwd; $(MAKE) warlock
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/usbprn/Makefile b/usr/src/uts/intel/usbprn/Makefile
index dd4bdc7ede..d01d9c2106 100644
--- a/usr/src/uts/intel/usbprn/Makefile
+++ b/usr/src/uts/intel/usbprn/Makefile
@@ -40,9 +40,6 @@ MODULE		= usbprn
 OBJECTS		= $(USBPRN_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USBPRN_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT	= $(USBPRN_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -77,10 +74,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -94,52 +89,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK) warlock_with_usba
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usbprn.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbprn.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/clients/printer/%.c \
-		$(UTSBASE)/common/sys/usb/clients/printer/usbprn.h
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_with_usba: $(WLCMD_DIR)/usbprn_with_usba.wlcmd $(WARLOCK_OUT) \
-	usba_files ohci_files ehci_files uhci_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbprn_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(WARLOCK_OUT) \
-	-l ../warlock/ddi_dki_impl.ll
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/usbsacm/Makefile b/usr/src/uts/intel/usbsacm/Makefile
index 390c663a59..23da8c76d0 100644
--- a/usr/src/uts/intel/usbsacm/Makefile
+++ b/usr/src/uts/intel/usbsacm/Makefile
@@ -38,9 +38,6 @@ MODULE		= usbsacm
 OBJECTS		= $(USBSACM_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USBSACM_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT	= $(USBSACM_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -65,10 +62,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -82,61 +77,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-TEST		= test
-
-#
-#	warlock
-#
-WARLOCK_CMD	= $(WLCMD_DIR)/$(MODULE).wlcmd
-
-USBSER_FILES = $(USBSER_OBJS:%.o=../usbser/%.ll)
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): warlock_with_usbser warlock_with_usba
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/clients/usbser/usbsacm/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_with_usbser: $(WARLOCK_OUT) usbser_files warlock_ddi.files \
-	$(WARLOCK_CMD)
-	$(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \
-		$(USBSER_FILES) -l ../warlock/ddi_dki_impl.ll
-
-warlock_with_usba: $(WLCMD_DIR)/usbsacm_with_usba.wlcmd $(WARLOCK_OUT) \
-	usbser_files usba_files ohci_files uhci_files ehci_files \
-	warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbsacm_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(USBSER_FILES) \
-		$(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll
-
-usbser_files:
-	@cd ../usbser; pwd; $(MAKE) warlock
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/usbser/Makefile b/usr/src/uts/intel/usbser/Makefile
index a4aa5057fe..9022579ae6 100644
--- a/usr/src/uts/intel/usbser/Makefile
+++ b/usr/src/uts/intel/usbser/Makefile
@@ -40,9 +40,6 @@ MODULE		= usbser
 OBJECTS		= $(USBSER_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USBSER_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT	= $(USBSER_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -75,10 +72,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -92,29 +87,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-TEST		= test
-
-#
-#	Warlock
-#
-WARLOCK_CMD	= $(WLCMD_DIR)/$(MODULE).wlcmd
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK):	$(WARLOCK_OUT) $(WARLOCK_CMD) warlock_ddi.files
-	$(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/clients/usbser/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/usbskel/Makefile b/usr/src/uts/intel/usbskel/Makefile
index f020121884..af92d96c7d 100644
--- a/usr/src/uts/intel/usbskel/Makefile
+++ b/usr/src/uts/intel/usbskel/Makefile
@@ -41,9 +41,6 @@ OBJECTS		= $(USBSKEL_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USBSKEL_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/usb/clients/usbskel
-WARLOCK_OUT	= $(USBSKEL_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -78,10 +75,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -95,53 +90,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK) warlock_with_usba
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usbskel.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbskel.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/clients/usbskel/%.c \
-		$(UTSBASE)/common/sys/usb/clients/usbskel/usbskel.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -DUSBSKEL_PM -DUSBSKEL_CPR -o $@ $<
-
-warlock_with_usba: $(WLCMD_DIR)/usbskel_with_usba.wlcmd $(WARLOCK_OUT) \
-	usba_files ohci_files ehci_files uhci_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbskel_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(WARLOCK_OUT) \
-	-l ../warlock/ddi_dki_impl.ll
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
-
diff --git a/usr/src/uts/intel/usbsksp/Makefile b/usr/src/uts/intel/usbsksp/Makefile
index 9fce0550b4..695d340f46 100644
--- a/usr/src/uts/intel/usbsksp/Makefile
+++ b/usr/src/uts/intel/usbsksp/Makefile
@@ -42,9 +42,6 @@ MODULE		= usbsksp
 OBJECTS		= $(USBSER_KEYSPAN_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USBSER_KEYSPAN_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT	= $(USBSER_KEYSPAN_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -67,10 +64,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -86,61 +81,3 @@ install:	$(INSTALL_DEPS)
 include $(UTSBASE)/intel/Makefile.targ
 
 CERRWARN	+= -_gcc=-Wno-uninitialized
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-TEST		= test
-
-#
-#	warlock
-#
-WARLOCK_CMD	= $(WLCMD_DIR)/usbser_keyspan.wlcmd
-
-USBSER_FILES = $(USBSER_OBJS:%.o=../usbser/%.ll)
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): warlock_with_usba warlock_with_usbser
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/clients/usbser/usbser_keyspan/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_with_usbser: $(WARLOCK_OUT) usbser_files warlock_ddi.files \
-	$(WARLOCK_CMD)
-	$(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \
-		$(USBSER_FILES) -l ../warlock/ddi_dki_impl.ll
-
-warlock_with_usba: $(WARLOCK_OUT) usbser_files \
-	$(WLCMD_DIR)/usbser_keyspan_with_usba.wlcmd \
-	usba_files ohci_files uhci_files ehci_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbser_keyspan_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(USBSER_FILES) \
-		$(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll
-
-usbser_files:
-	@cd ../usbser; pwd; $(MAKE) warlock
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/usbsprl/Makefile b/usr/src/uts/intel/usbsprl/Makefile
index 3a896a7a4e..a2fe99fea9 100644
--- a/usr/src/uts/intel/usbsprl/Makefile
+++ b/usr/src/uts/intel/usbsprl/Makefile
@@ -38,10 +38,7 @@ UTSBASE	= ../..
 MODULE		= usbsprl
 OBJECTS		= $(USBSPRL_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USBSPRL_OBJS:%.o=$(LINTS_DIR)/%.ln)
-WARLOCK_OUT     = $(USBSPRL_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -66,10 +63,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -83,60 +78,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-TEST		= test
-
-#
-#	warlock
-#
-WARLOCK_CMD	= $(WLCMD_DIR)/$(MODULE).wlcmd
-USBSER_FILES = $(USBSER_OBJS:%.o=../usbser/%.ll)
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): warlock_with_usba warlock_with_usbser
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/clients/usbser/usbsprl/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_with_usbser: $(WARLOCK_OUT) usbser_files warlock_ddi.files \
-	$(WARLOCK_CMD)
-	$(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \
-		$(USBSER_FILES) -l ../warlock/ddi_dki_impl.ll
-
-warlock_with_usba:  $(WARLOCK_OUT) usbser_files \
-	$(WLCMD_DIR)/usbsprl_with_usba.wlcmd usba_files ohci_files uhci_files \
-	ehci_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbsprl_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(USBSER_FILES) \
-		$(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll
-
-usbser_files:
-	@cd ../usbser; pwd; $(MAKE) warlock
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/usbvc/Makefile b/usr/src/uts/intel/usbvc/Makefile
index a447b0f875..303a025e1e 100644
--- a/usr/src/uts/intel/usbvc/Makefile
+++ b/usr/src/uts/intel/usbvc/Makefile
@@ -42,9 +42,6 @@ MODULE		= usbvc
 OBJECTS		= $(USBVC_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USBVC_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT	= $(USBVC_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -87,10 +84,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -104,52 +99,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK) warlock_with_usba
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usbvc.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbvc.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/clients/video/usbvc/%.c \
-		$(UTSBASE)/common/sys/usb/clients/video/usbvc/usbvc_var.h
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_with_usba: $(WLCMD_DIR)/usbvc_with_usba.wlcmd $(WARLOCK_OUT) \
-	usba_files ohci_files ehci_files uhci_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbvc_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(WARLOCK_OUT) \
-	-l ../warlock/ddi_dki_impl.ll
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/warlock/Makefile b/usr/src/uts/intel/warlock/Makefile
deleted file mode 100644
index b109499204..0000000000
--- a/usr/src/uts/intel/warlock/Makefile
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# uts/intel/warlock/Makefile
-#
-#	Path to the base of the uts directory tree (usually /usr/src/uts).
-#
-UTSBASE = ../..
-
-#
-#	Define the module and object file sets.
-#
-MODULE		= warlock
-ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-
-.KEEP_STATE:
-
-CFLAGS += -I../../common/sys -I../../sun/sys/scsi -D_KERNEL
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-include $(UTSBASE)/intel/Makefile.intel
-
-#
-#	lock_lint rules
-#
-all:	warlock warlock.1394 warlock.ecpp warlock.scsi \
-	warlock.usb warlock.ib warlock.sata warlock.wc \
-	warlock.audiohd
-
-warlock: $(MODULE).ok 
-
-warlock.ok: ddi_dki_impl.ll scsi.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/warlock/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock.usb:
-	@cd ../usba; $(MAKE) clean; $(MAKE) warlock
-	@cd ../ohci; $(MAKE) clean; $(MAKE) warlock
-	@cd ../uhci; $(MAKE) clean; $(MAKE) warlock
-	@cd ../ehci; $(MAKE) clean; $(MAKE) warlock
-	@cd ../hid; $(MAKE) clean; $(MAKE) warlock
-	@cd ../scsa2usb; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usb_ac; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usb_as; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usb_ah; $(MAKE) clean; $(MAKE) warlock
-	@cd ../ugen; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usb_mid; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usbprn; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usbser; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usbsksp; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usbsprl; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usbsacm; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usbecm; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usbskel; $(MAKE) clean; $(MAKE) warlock
-
-warlock.scsi:
-	@cd ../sd; $(MAKE) clean; $(MAKE) warlock
-	@cd ../ses; $(MAKE) clean; $(MAKE) warlock
-	@cd ../st; $(MAKE) clean; $(MAKE) warlock
-
-warlock.1394:
-	@cd ../s1394; $(MAKE) clean; $(MAKE) warlock
-	@cd ../hci1394; $(MAKE) clean; $(MAKE) warlock
-	@cd ../scsa1394; $(MAKE) clean; $(MAKE) warlock
-	@cd ../av1394; $(MAKE) clean; $(MAKE) warlock
-
-warlock.ecpp:
-	@cd ../ecpp; $(MAKE) clean; $(MAKE) warlock
-
-warlock.ib:
-	@cd ../ibmf; $(MAKE) clean; $(MAKE) warlock
-	@cd ../ib; $(MAKE) clean; $(MAKE) warlock
-	@cd ../ibtl; $(MAKE) clean; $(MAKE) warlock
-	@cd ../ibcm; $(MAKE) clean; $(MAKE) warlock
-	@cd ../ibd; $(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
-
-warlock.wc:
-	@cd ../wc; $(MAKE) clean; $(MAKE) warlock
-
-warlock.audiohd:
-	@cd ../audiohd; $(MAKE) clean; $(MAKE) warlock
diff --git a/usr/src/uts/intel/wc/Makefile b/usr/src/uts/intel/wc/Makefile
index 29f823b998..d84d5a4faa 100644
--- a/usr/src/uts/intel/wc/Makefile
+++ b/usr/src/uts/intel/wc/Makefile
@@ -24,7 +24,7 @@
 # Use is subject to license terms.
 #
 #
-#	This makefile drives the production of the wc driver 
+#	This makefile drives the production of the wc driver
 #	kernel module.
 #
 #	intel implementation architecture independent
@@ -43,9 +43,6 @@ OBJECTS		= $(WC_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(WC_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io
-WARLOCK_OUT	= $(WC_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -91,37 +88,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
-
-#
-#	Defines for local commands
-#
-TEST		= test
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-
-#
-#	warlock targets
-#
-
-#
-# vcons_conf.c is compile to genunix, add it to WARLOCK_OUT
-#
-WARLOCK_OUT	+= vcons_conf.ll
-
-warlock:	$(WARLOCK_OUT) sdev_vtops.file  warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/wc.wlcmd $(WARLOCK_OUT) \
-	-l ../../intel/warlock/ddi_dki_impl.ll
-	$(WARLOCK) -c $(WLCMD_DIR)/wc_devfs.wlcmd sdev_vtops.ll vcons_conf.ll \
-	-l ../../intel/warlock/ddi_dki_impl.ll
-	$(TOUCH) $(WARLOCK_OK)
-
-%.ll:	$(UTSBASE)/common/io/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-sdev_vtops.file:
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o sdev_vtops.ll -c \
-	../../common/fs/dev/sdev_vtops.c
-
-warlock_ddi.files:
-	@cd ../../intel/warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/aac/Makefile b/usr/src/uts/sparc/aac/Makefile
index c5b5079f59..53ee28aeba 100644
--- a/usr/src/uts/sparc/aac/Makefile
+++ b/usr/src/uts/sparc/aac/Makefile
@@ -43,9 +43,6 @@ OBJECTS		= $(AAC_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(AAC_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/aac
-WARLOCK_OUT     = $(AAC_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -59,9 +56,9 @@ ALL_TARGET	= $(BINARY) $(CONFMOD)
 LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS		+= $(CCVERBOSE)
 
 #
@@ -104,37 +101,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-SCSI_FILES = $(SCSI_OBJS:%.o= -l $(UTSBASE)/sparc/scsi/%.ll)
-
-%.wlcmd:
-	cd $(WLCMD_DIR); $(TEST) -f $@ || $(SCCS) get $@
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files scsi.files aac.wlcmd
-	$(WARLOCK) -c $(WLCMD_DIR)/aac.wlcmd $(WARLOCK_OUT) \
-	$(SCSI_FILES) \
-	$(UTSBASE)/sparc/warlock/scsi.ll \
-	-l $(UTSBASE)/sparc/warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/aac/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd $(UTSBASE)/sparc/warlock; pwd; $(MAKE) warlock
-
-scsi.files:
-	@cd $(UTSBASE)/sparc/scsi; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/ac97/Makefile b/usr/src/uts/sparc/ac97/Makefile
index 84b7c69ea7..1abee91426 100644
--- a/usr/src/uts/sparc/ac97/Makefile
+++ b/usr/src/uts/sparc/ac97/Makefile
@@ -39,9 +39,6 @@ MODULE		= ac97
 OBJECTS		= $(AC97_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(AC97_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT	= $(AC97_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -67,10 +64,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
diff --git a/usr/src/uts/sparc/ahci/Makefile b/usr/src/uts/sparc/ahci/Makefile
deleted file mode 100644
index a80a11100e..0000000000
--- a/usr/src/uts/sparc/ahci/Makefile
+++ /dev/null
@@ -1,150 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# uts/sparc/ahci/Makefile
-#
-#	This makefile drives the production of the 
-#	"/kernel/drv/ahci" kernel module.
-#
-#	sparc architecture dependent
-#
-
-#
-#	Path to the base of the uts directory tree (usually /usr/src/uts).
-#
-UTSBASE	= ../..
-
-#
-#	Define the module and object file sets.
-#
-MODULE		= ahci
-OBJECTS		= $(AHCI_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(AHCI_OBJS:%.o=$(LINTS_DIR)/%.ln)
-WARLOCK_OUT     = $(AHCI_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-CONF_SRCDIR     = $(UTSBASE)/common/io/sata/adapters/ahci
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
-
-#
-#	Include common rules.
-#
-include $(UTSBASE)/sparc/Makefile.sparc
-
-#
-#	Define targets
-#
-ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
-INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
-
-#
-#	Overrides.
-#
-DEBUG_FLGS	=
-DEBUG_DEFS	+= $(DEBUG_FLGS)
-
-#
-# lint pass one enforcement
-#  
-CFLAGS += $(CCVERBOSE)
-
-CERRWARN	+= -_gcc=-Wno-parentheses
-CERRWARN	+= -_gcc=-Wno-unused-label
-CERRWARN	+= -_gcc=-Wno-uninitialized
-
-#
-#	Default build targets.
-#
-.KEEP_STATE:
-
-def:		$(DEF_DEPS)
-
-all:		$(ALL_DEPS)
-
-clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
-
-clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
-
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
-install:	$(INSTALL_DEPS)
-
-#
-#	Include common targets.
-#
-include $(UTSBASE)/sparc/Makefile.targ
-
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-SD_FILES = $(SD_OBJS:%.o=../sd/%.ll)
-SATA_FILES = $(SATA_OBJS:%.o=-l ../sata/%.ll)
-SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
-CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WLCMD_DIR)/ahci.wlcmd $(WARLOCK_OUT) warlock_ddi.files \
-	sata.files scsi.files sd.files cmlb.files
-	$(WARLOCK) -c $(WLCMD_DIR)/ahci.wlcmd $(WARLOCK_OUT) \
-	$(SD_FILES) \
-	$(SCSI_FILES) \
-	$(CMLB_FILES) \
-        $(SATA_FILES) \
-	-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/sata/adapters/ahci/%.c
-	$(WLCC) $(CPPFLAGS) -D DEBUG -D __sparcv9 -o $@ $<
-
-sata.files:
-	@cd ../sata; pwd; $(MAKE) warlock
-
-scsi.files:
-	@cd ../scsi; pwd; $(MAKE) warlock
-
-sd.files: 
-	@cd ../sd; pwd; $(MAKE) warlock_alone
-
-cmlb.files:
-	@cd ../cmlb; pwd; $(MAKE) warlock
-
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/av1394/Makefile b/usr/src/uts/sparc/av1394/Makefile
index 3b610a5ea4..8699d8b0ee 100644
--- a/usr/src/uts/sparc/av1394/Makefile
+++ b/usr/src/uts/sparc/av1394/Makefile
@@ -35,9 +35,6 @@ MODULE		= av1394
 OBJECTS		= $(AV1394_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(AV1394_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT     = $(AV1394_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -95,10 +92,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -112,27 +107,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	Warlock targets
-#
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/av1394.wlcmd
-	$(WARLOCK) -c $(WLCMD_DIR)/av1394.wlcmd $(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/1394/targets/av1394/%.c
-	$(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/cmlb/Makefile b/usr/src/uts/sparc/cmlb/Makefile
index b21cbbfdcb..d66ea89566 100644
--- a/usr/src/uts/sparc/cmlb/Makefile
+++ b/usr/src/uts/sparc/cmlb/Makefile
@@ -39,9 +39,6 @@ UTSBASE	= ../..
 MODULE		= cmlb
 OBJECTS		= $(CMLB_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(CMLB_OBJS:%.o=$(LINTS_DIR)/%.ln)
-WARLOCK_OUT	= $(CMLB_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
 
 #
 #	Include common rules.
@@ -91,10 +88,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -108,21 +103,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-
-#
-#	Warlock targets
-#
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK):	$(WARLOCK_OUT)
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
diff --git a/usr/src/uts/sparc/dad/Makefile b/usr/src/uts/sparc/dad/Makefile
index bccba311ff..fe137a836d 100644
--- a/usr/src/uts/sparc/dad/Makefile
+++ b/usr/src/uts/sparc/dad/Makefile
@@ -43,9 +43,6 @@ OBJECTS		= $(DAD_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(DAD_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/sun/io/dada/targets
-WARLOCK_OUT     = $(DAD_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -94,10 +91,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -111,46 +106,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include	$(UTSBASE)/sparc/Makefile.targ
-
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-# Warlock targets
-#
-# Note that in warlock_with_{esp,isp} it is important to load sd.ll
-# before {isp,esp}.ll; the reason is that both have _init/_info/_fini
-# and warlock can only handle one extern function by a given name;
-# any loaded after the first are ignored.
-
-DADA_FILES = $(DADA_OBJS:%.o=-l $(UTSBASE)/sparc/dada/%.ll)
-CMLB_FILES = $(CMLB_OBJS:%.o=-l $(UTSBASE)/sparc/cmlb/%.ll)
-
-warlock: warlock_alone
-
-warlock_alone: $(WARLOCK_OK)
-
-dada_files:
-	@cd $(UTSBASE)/sparc/dada; pwd; $(MAKE) warlock
-
-cmlb_files:
-	@cd $(UTSBASE)/sparc/cmlb; pwd; $(MAKE) warlock
-
-$(WARLOCK_OK): $(WLCMD_DIR)/dad.wlcmd $(WARLOCK_OUT) dada_files \
-	warlock_ddi.files cmlb_files
-	$(WARLOCK) -c $(WLCMD_DIR)/dad.wlcmd $(WARLOCK_OUT) -l $(DADA_FILES) \
-	-l $(CMLB_FILES) \
-	-l $(UTSBASE)/sparc/warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/sun/io/dada/targets/%.c
-	$(WLCC) $(CPPFLAGS) -o $@ $<
-
-warlock_ddi.files:
-	@cd $(UTSBASE)/sparc/warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/dada/Makefile b/usr/src/uts/sparc/dada/Makefile
index e445533524..692b84c327 100644
--- a/usr/src/uts/sparc/dada/Makefile
+++ b/usr/src/uts/sparc/dada/Makefile
@@ -25,8 +25,6 @@
 # Use is subject to license terms.
 #
 
-#ident	"%Z%%M%	%I%	%E% SMI"
-
 #
 #	Path to the base of the uts directory tree (usually /usr/src/uts).
 #
@@ -39,8 +37,6 @@ MODULE		= dada
 OBJECTS		= $(DADA_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(DADA_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT     = $(DADA_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
 
 #
 #	Include common rules.
@@ -77,10 +73,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 modlintlib:	$(MODLINTLIB_DEPS) lint64
 
@@ -92,23 +86,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-
-#
-#	Warlock targets
-#
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT)
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/sun/io/dada/impl/%.c
-	$(WLCC) $(CPPFLAGS) -o $@ $<
-
-%.ll: $(UTSBASE)/sun/io/dada/conf/%.c
-	$(WLCC) $(CPPFLAGS) -o $@ $<
diff --git a/usr/src/uts/sparc/daplt/Makefile b/usr/src/uts/sparc/daplt/Makefile
index ba5e0800a0..8000f5772c 100644
--- a/usr/src/uts/sparc/daplt/Makefile
+++ b/usr/src/uts/sparc/daplt/Makefile
@@ -39,9 +39,6 @@ LINTS		= $(DAPLT_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/ib/clients/daplt
 LDFLAGS		+= -dy -Nmisc/ibtl -Nmisc/ibcm
-WARLOCK_OUT     = $(DAPLT_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -60,9 +57,9 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 #
 INCLUDE_PATH += -I$(UTSBASE)/common/sys/ib/clients/daplt
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -95,10 +92,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -112,28 +107,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#       Defines for local commands.
-#
-WARLOCK         = warlock
-WLCC            = wlcc
-TOUCH           = touch
-TEST            = test
-
-DAPL_FILES = $(DAPL_OBJS:%.o= -l ../daplt/%.ll)
-
-warlock: $(WARLOCK_OK) $(WARLOCK_OUT)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/daplt.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/daplt.wlcmd $(WARLOCK_OUT) \
-		-l $(UTSBASE)/sparc/warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/clients/daplt/%.c \
-	$(UTSBASE)/common/sys/ib/clients/daplt/daplt.h \
-	$(UTSBASE)/common/sys/ib/clients/daplt/daplt_if.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-        
-warlock_ddi.files:
-	@cd $(UTSBASE)/sparc/warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/ecpp/Makefile b/usr/src/uts/sparc/ecpp/Makefile
index be88954984..677fce57ee 100644
--- a/usr/src/uts/sparc/ecpp/Makefile
+++ b/usr/src/uts/sparc/ecpp/Makefile
@@ -27,7 +27,7 @@
 #
 #	This Makefile drives the production of ecpp
 #	kernel module.
-#	
+#
 #
 
 #
@@ -43,9 +43,6 @@ OBJECTS		= $(ECPP_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(ECPP_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io
-WARLOCK_OUT	= $(ECPP_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -89,10 +86,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 modlintlib:	$(MODLINTLIB_DEPS) lint64
 
@@ -104,29 +99,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ecpp.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/ecpp.wlcmd $(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-
-%.ll: $(UTSBASE)/common/io/%.c $(UTSBASE)/common/sys/ecppvar.h \
-		$(UTSBASE)/common/sys/ecppio.h
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/ehci/Makefile b/usr/src/uts/sparc/ehci/Makefile
index 33d39ca0cb..65fcbe5430 100644
--- a/usr/src/uts/sparc/ehci/Makefile
+++ b/usr/src/uts/sparc/ehci/Makefile
@@ -38,14 +38,11 @@ UTSBASE	= ../..
 #
 #	Define the module and object file sets.
 #
-MODULE		= ehci 
+MODULE		= ehci
 OBJECTS		= $(EHCI_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(EHCI_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/usb/hcd/ehci
-WARLOCK_OUT	= $(EHCI_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -78,10 +75,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -95,34 +90,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES = $(USBA_OBJS:%.o= -l ../usba/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ehci.wlcmd warlock_ddi.files \
-	usba.files
-	$(WARLOCK) -c $(WLCMD_DIR)/ehci.wlcmd  $(WARLOCK_OUT) \
-	$(USBA_FILES) \
-	-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/hcd/ehci/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
-
-usba.files:
-	@cd ../usba; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/eibnx/Makefile b/usr/src/uts/sparc/eibnx/Makefile
index c3264d57cb..7380f424ab 100644
--- a/usr/src/uts/sparc/eibnx/Makefile
+++ b/usr/src/uts/sparc/eibnx/Makefile
@@ -42,9 +42,6 @@ OBJECTS		= $(EIBNX_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(EIBNX_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/ib/clients/eoib
-WARLOCK_OUT	= $(EIBNX_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 # Include common rules
@@ -68,9 +65,9 @@ DEF_BUILDS	= $(DEF_BUILDSONLY64)
 #
 CPPFLAGS += -DENX_DEBUG
 
-# 
-# Lint pass one enforcement 
-# 
+#
+# Lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -96,10 +93,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -113,34 +108,3 @@ install:	$(INSTALL_DEPS)
 # Include common targets
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-# Defines for local commands
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/eibnx.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/eibnx.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/clients/eoib/enx_main.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/enx_hdlrs.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/enx_ibt.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/enx_log.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/enx_fip.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/enx_misc.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/enx_q.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/enx_ctl.c \
-	    $(UTSBASE)/common/sys/ib/clients/eoib/fip.h \
-	    $(UTSBASE)/common/sys/ib/clients/eoib/eib.h \
-	    $(UTSBASE)/common/sys/ib/clients/eoib/enx_impl.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/eoib/Makefile b/usr/src/uts/sparc/eoib/Makefile
index 93dacb1a88..01a11078fc 100644
--- a/usr/src/uts/sparc/eoib/Makefile
+++ b/usr/src/uts/sparc/eoib/Makefile
@@ -41,9 +41,6 @@ MODULE		= eoib
 OBJECTS		= $(EOIB_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(EOIB_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT	= $(EOIB_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 # Include common rules
@@ -67,9 +64,9 @@ DEF_BUILDS	= $(DEF_BUILDSONLY64)
 #
 CPPFLAGS += -DEIB_DEBUG
 
-# 
-# Lint pass one enforcement 
-# 
+#
+# Lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 CERRWARN	+= -_gcc=-Wno-switch
@@ -90,10 +87,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -107,39 +102,3 @@ install:	$(INSTALL_DEPS)
 # Include common targets
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-# Defines for local commands
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/eoib.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/eoib.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/clients/eoib/eib_adm.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_chan.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_cmn.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_ctl.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_data.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_fip.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_ibt.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_log.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_mac.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_main.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_rsrc.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_svc.c \
-	    $(UTSBASE)/common/io/ib/clients/eoib/eib_vnic.c \
-	    $(UTSBASE)/common/sys/ib/clients/eoib/fip.h \
-	    $(UTSBASE)/common/sys/ib/clients/eoib/eib.h \
-	    $(UTSBASE)/common/sys/ib/clients/eoib/eib_impl.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/fas/Makefile b/usr/src/uts/sparc/fas/Makefile
index 8af59c8f2e..03dea3fc60 100644
--- a/usr/src/uts/sparc/fas/Makefile
+++ b/usr/src/uts/sparc/fas/Makefile
@@ -41,9 +41,6 @@ MODULE		= fas
 OBJECTS		= $(FAS_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(FAS_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT     = $(FAS_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -57,9 +54,9 @@ ALL_TARGET	= $(BINARY)
 LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -89,10 +86,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -106,35 +101,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-SCSI_FILES = $(SCSI_OBJS:%.o= -l ../scsi/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/fas.wlcmd warlock_ddi.files \
-	scsi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/fas.wlcmd $(WARLOCK_OUT) \
-	../warlock/scsi.ll \
-	-l ../warlock/ddi_dki_impl.ll \
-	$(SCSI_FILES)
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/sun/io/scsi/adapters/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
-
-scsi.files:
-	@cd ../scsi; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/fcip/Makefile b/usr/src/uts/sparc/fcip/Makefile
index af515c5d35..6e70560f9b 100644
--- a/usr/src/uts/sparc/fcip/Makefile
+++ b/usr/src/uts/sparc/fcip/Makefile
@@ -89,9 +89,6 @@ clobber:	$(CLOBBER_DEPS)
 
 lint:		$(LINT_DEPS)
 
-warlock:
-	@echo warlock is not supported
-
 modlintlib:	$(MODLINTLIB_DEPS)
 
 clean.lint:	$(CLEAN_LINT_DEPS)
diff --git a/usr/src/uts/sparc/fcsm/Makefile b/usr/src/uts/sparc/fcsm/Makefile
index ce564e5eff..faaa084924 100644
--- a/usr/src/uts/sparc/fcsm/Makefile
+++ b/usr/src/uts/sparc/fcsm/Makefile
@@ -85,9 +85,6 @@ clobber:	$(CLOBBER_DEPS)
 
 lint:		$(LINT_DEPS)
 
-warlock:
-	@echo warlock is not supported
-
 modlintlib:	$(MODLINTLIB_DEPS)
 
 clean.lint:	$(CLEAN_LINT_DEPS)
diff --git a/usr/src/uts/sparc/hci1394/Makefile b/usr/src/uts/sparc/hci1394/Makefile
index 068edbf679..5bdb63b1e0 100644
--- a/usr/src/uts/sparc/hci1394/Makefile
+++ b/usr/src/uts/sparc/hci1394/Makefile
@@ -45,9 +45,6 @@ LINTS		= $(HCI1394_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/1394/adapters
 LDFLAGS		+= -dy -Nmisc/s1394
-WARLOCK_OUT     = $(HCI1394_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -71,9 +68,9 @@ CLEANLINTFILES	+= $(LINT32_FILES)
 DEBUG_DEFS_DBG32 += -DTNF_DEBUG
 DEBUG_DEFS_DBG64 += -DTNF_DEBUG
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -101,10 +98,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -118,35 +113,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	Warlock targets
-#
-S1394_FILES = $(S1394_OBJS:%.o= -l ../s1394/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) s1394.files warlock_ddi.files \
-	$(WLCMD_DIR)/hci1394.wlcmd
-	$(WARLOCK) -c $(WLCMD_DIR)/hci1394.wlcmd \
-		$(WARLOCK_OUT) $(S1394_FILES) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/1394/adapters/%.c
-	$(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
-
-s1394.files:
-	@cd ../s1394; pwd; $(MAKE) warlock
-
diff --git a/usr/src/uts/sparc/hermon/Makefile b/usr/src/uts/sparc/hermon/Makefile
index 0b302b9953..23ff5b1ecf 100644
--- a/usr/src/uts/sparc/hermon/Makefile
+++ b/usr/src/uts/sparc/hermon/Makefile
@@ -44,9 +44,6 @@ LINTS		= $(HERMON_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/ib/adapters/hermon
 LDFLAGS		+= -dy -Ndrv/ib -Nmisc/ibtl -Nmisc/ibmf
-WARLOCK_OUT	= $(HERMON_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -106,25 +103,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/hermon.wlcmd
-	$(WARLOCK) -c $(WLCMD_DIR)/hermon.wlcmd $(WARLOCK_OUT) -l \
-	$(UTSBASE)/sparc/warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/adapters/hermon/%.c
-	$(WLCC)  $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd $(UTSBASE)/sparc/warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/hid/Makefile b/usr/src/uts/sparc/hid/Makefile
index c4295a87ce..85f360fd7d 100644
--- a/usr/src/uts/sparc/hid/Makefile
+++ b/usr/src/uts/sparc/hid/Makefile
@@ -43,18 +43,15 @@ MODULE		= hid
 OBJECTS		= $(HID_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(HID_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT	= $(HID_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
 #
 include $(UTSBASE)/sparc/Makefile.sparc
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -85,10 +82,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -102,54 +97,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK) warlock_with_usba
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/hid.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/hid.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/clients/hid/%.c \
-		$(UTSBASE)/common/sys/usb/clients/hid/hidvar.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_with_usba: $(WLCMD_DIR)/hid_with_usba.wlcmd  $(WARLOCK_OUT) usba_files \
-	ohci_files ehci_files uhci_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/hid_with_usba.wlcmd \
-		$(USBA_FILES) \
-		$(UHCI_FILES) $(OHCI_FILES) $(EHCI_FILES) \
-		$(WARLOCK_OUT) \
-	-l ../warlock/ddi_dki_impl.ll
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
-
diff --git a/usr/src/uts/sparc/ib/Makefile b/usr/src/uts/sparc/ib/Makefile
index 7702adf1a5..4432cce6a9 100644
--- a/usr/src/uts/sparc/ib/Makefile
+++ b/usr/src/uts/sparc/ib/Makefile
@@ -44,9 +44,6 @@ OBJECTS		= $(IB_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(IB_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/ib/ibnex
-WARLOCK_OUT	= $(IB_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -100,10 +97,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -117,29 +112,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ib.wlcmd ibdm_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/ib.wlcmd $(WARLOCK_OUT)  \
-		-l ../ibdm/ibdm.ll -l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/ibnex/%.c \
-		$(UTSBASE)/common/sys/ib/ibnex/ibnex.h \
-		$(UTSBASE)/common/sys/ib/ibnex/ibnex_devctl.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-ibdm_files :
-	@cd ../ibdm; pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/ibcm/Makefile b/usr/src/uts/sparc/ibcm/Makefile
index c4f9bd7924..8cd008039b 100644
--- a/usr/src/uts/sparc/ibcm/Makefile
+++ b/usr/src/uts/sparc/ibcm/Makefile
@@ -40,9 +40,6 @@ MODULE		= ibcm
 OBJECTS		= $(IBCM_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(IBCM_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT    = $(IBCM_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -100,10 +97,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -117,24 +112,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#       Defines for local commands.
-#
-WARLOCK         = warlock
-WLCC            = wlcc
-TOUCH           = touch
-TEST            = test
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ibcm.wlcmd
-	$(WARLOCK) -c $(WLCMD_DIR)/ibcm.wlcmd $(WARLOCK_OUT)
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/mgt/ibcm/%.c \
-	$(UTSBASE)/common/sys/ib/mgt/ibcm/ibcm_impl.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/ibdm/Makefile b/usr/src/uts/sparc/ibdm/Makefile
index a749558c65..e713659ab8 100644
--- a/usr/src/uts/sparc/ibdm/Makefile
+++ b/usr/src/uts/sparc/ibdm/Makefile
@@ -42,8 +42,6 @@ MODULE		= ibdm
 OBJECTS		= $(IBDM_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(IBDM_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT	= $(IBDM_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
 
 #
 #	Include common rules.
@@ -63,9 +61,9 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 ALL_BUILDS	= $(ALL_BUILDSONLY64)
 DEF_BUILDS	= $(DEF_BUILDSONLY64)
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -92,10 +90,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -109,22 +105,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-warlock: $(WARLOCK_OK)
-
-
-$(WARLOCK_OK): $(WARLOCK_OUT) 
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/mgt/ibdm/%.c \
-		$(UTSBASE)/common/sys/ib/mgt/ibdm/ibdm_impl.h \
-		$(UTSBASE)/common/sys/ib/mgt/ibdm/ibdm_ibnex.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
diff --git a/usr/src/uts/sparc/ibdma/Makefile b/usr/src/uts/sparc/ibdma/Makefile
index ef3ee9c03e..cb60c81a3c 100644
--- a/usr/src/uts/sparc/ibdma/Makefile
+++ b/usr/src/uts/sparc/ibdma/Makefile
@@ -40,8 +40,6 @@ MODULE		= ibdma
 OBJECTS		= $(IBDMA_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(IBDMA_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT	= $(IBDMA_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
 
 #
 #	Include common rules.
@@ -61,9 +59,9 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 ALL_BUILDS	= $(ALL_BUILDSONLY64)
 DEF_BUILDS	= $(DEF_BUILDSONLY64)
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -88,10 +86,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -105,22 +101,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-warlock: $(WARLOCK_OK)
-
-
-$(WARLOCK_OK): $(WARLOCK_OUT) 
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/mgt/ibdma/%.c \
-		$(UTSBASE)/common/sys/ib/mgt/ibdma/ibdma_impl.h \
-		$(UTSBASE)/common/sys/ib/mgt/ibdma/ibdma.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
diff --git a/usr/src/uts/sparc/ibmf/Makefile b/usr/src/uts/sparc/ibmf/Makefile
index b3c8dc854e..70413eda4f 100644
--- a/usr/src/uts/sparc/ibmf/Makefile
+++ b/usr/src/uts/sparc/ibmf/Makefile
@@ -42,9 +42,6 @@ OBJECTS		= $(IBMF_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(IBMF_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
 LDFLAGS		+= -dy -Nmisc/ibtl
-WARLOCK_OUT     = $(IBMF_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -66,9 +63,9 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 ALL_BUILDS	= $(ALL_BUILDSONLY64)
 DEF_BUILDS	= $(DEF_BUILDSONLY64)
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -91,10 +88,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -108,27 +103,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-TEST		= test
-
-#
-#	Warlock targets
-#
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/ibmf.wlcmd
-	$(WARLOCK) -c $(WLCMD_DIR)/ibmf.wlcmd $(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/mgt/ibmf/%.c
-	$(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/ibp/Makefile b/usr/src/uts/sparc/ibp/Makefile
index 908fd36b5d..6017f36362 100644
--- a/usr/src/uts/sparc/ibp/Makefile
+++ b/usr/src/uts/sparc/ibp/Makefile
@@ -38,9 +38,7 @@ ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/ib/clients/ibd
 LDFLAGS		+= -dy -Nmisc/mac -Nmisc/ibtl -Nmisc/ibcm -Nmisc/ibmf -Ndrv/ip \
 		-Nmisc/dls -Ndrv/dld
-WARLOCK_OUT     = $(IBD_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
+
 #
 #	Include common rules.
 #
@@ -60,9 +58,9 @@ ALL_BUILDS	= $(ALL_BUILDSONLY64)
 DEF_BUILDS	= $(DEF_BUILDSONLY64)
 CLEANLINTFILES	+= $(LINT32_FILES)
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -86,10 +84,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -103,25 +99,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#       Defines for local commands.
-#
-WARLOCK         = warlock
-WLCC            = wlcc
-TOUCH           = touch
-TEST            = test
-
-warlock: $(WARLOCK_OK) $(WARLOCK_OUT)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ibd.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/ibd.wlcmd $(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/clients/ibd/%.c \
-	$(UTSBASE)/common/sys/ib/clients/ibd/ibd.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/ibtl/Makefile b/usr/src/uts/sparc/ibtl/Makefile
index d096ba4aae..acbd0b110f 100644
--- a/usr/src/uts/sparc/ibtl/Makefile
+++ b/usr/src/uts/sparc/ibtl/Makefile
@@ -41,9 +41,6 @@ MODULE		= ibtl
 OBJECTS		= $(IBTL_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(IBTL_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT     = $(IBTL_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -94,10 +91,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -111,24 +106,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#       Defines for local commands.
-#
-WARLOCK         = warlock
-WLCC            = wlcc
-TOUCH           = touch
-TEST            = test
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/ibtl.wlcmd
-	$(WARLOCK) -c $(WLCMD_DIR)/ibtl.wlcmd $(WARLOCK_OUT) -l \
-	../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/ibtl/%.c
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/mii/Makefile b/usr/src/uts/sparc/mii/Makefile
index 620f0e1a9d..a853240a72 100644
--- a/usr/src/uts/sparc/mii/Makefile
+++ b/usr/src/uts/sparc/mii/Makefile
@@ -39,9 +39,6 @@ MODULE		= mii
 OBJECTS		= $(MII_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(MII_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT	= $(MII_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -70,10 +67,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
diff --git a/usr/src/uts/sparc/mpt_sas/Makefile b/usr/src/uts/sparc/mpt_sas/Makefile
index 69bd3403b8..4f7414a794 100644
--- a/usr/src/uts/sparc/mpt_sas/Makefile
+++ b/usr/src/uts/sparc/mpt_sas/Makefile
@@ -39,12 +39,9 @@ OBJECTS		= $(MPTSAS_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(MPTSAS_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/scsi/adapters/mpt_sas
-WARLOCK_OUT     = $(MPTSAS_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
-# 	Kernel Module Dependencies
+#	Kernel Module Dependencies
 #
 LDFLAGS += -dy -Nmisc/scsi -Ndrv/scsi_vhci -Nmisc/sata
 
@@ -60,9 +57,9 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 #
 include $(UTSBASE)/sparc/Makefile.sparc
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 CERRWARN	+= -_gcc=-Wno-parentheses
@@ -79,10 +76,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -96,36 +91,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-SCSI_FILES = $(SCSI_OBJS:%.o= -l $(UTSBASE)/sparc/scsi/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files scsi.files \
-	$(WLCMD_DIR)/mptsas.wlcmd
-	$(WARLOCK) -c $(WLCMD_DIR)/mptsas.wlcmd $(WARLOCK_OUT) \
-	$(UTSBASE)/sparc/warlock/scsi.ll \
-	$(SCSI_FILES) \
-	-l $(UTSBASE)/sparc/warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/scsi/adapters/mpt_sas/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd $(UTSBASE)/sparc/warlock; pwd; $(MAKE) warlock
-
-scsi.files:
-	@cd $(UTSBASE)/sparc/scsi; pwd; $(MAKE) warlock
-
diff --git a/usr/src/uts/sparc/nulldriver/Makefile b/usr/src/uts/sparc/nulldriver/Makefile
index 8377da2f73..e49222c0a7 100644
--- a/usr/src/uts/sparc/nulldriver/Makefile
+++ b/usr/src/uts/sparc/nulldriver/Makefile
@@ -79,9 +79,6 @@ clobber:	$(CLOBBER_DEPS)
 
 lint:		$(LINT_DEPS)
 
-warlock:
-	@echo warlock is not supported
-
 modlintlib:	$(MODLINTLIB_DEPS)
 
 clean.lint:	$(CLEAN_LINT_DEPS)
diff --git a/usr/src/uts/sparc/nv_sata/Makefile b/usr/src/uts/sparc/nv_sata/Makefile
deleted file mode 100644
index 04791ed8c7..0000000000
--- a/usr/src/uts/sparc/nv_sata/Makefile
+++ /dev/null
@@ -1,140 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-#
-#	Path to the base of the uts directory tree (usually /usr/src/uts).
-#
-UTSBASE	= ../..
-
-#
-#	Define the module and object file sets.
-#
-MODULE		= nv_sata
-OBJECTS		= $(NV_SATA_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(NV_SATA_OBJS:%.o=$(LINTS_DIR)/%.ln)
-WARLOCK_OUT     = $(NV_SATA_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-CONF_SRCDIR     = $(UTSBASE)/common/io/sata/adapters/nv_sata
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
-
-#
-#	Include common rules.
-#
-include $(UTSBASE)/sparc/Makefile.sparc
-
-#
-#	Define targets
-#
-ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
-INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
-
-#
-#	Overrides.
-#
-DEBUG_FLGS	=
-DEBUG_DEFS	+= $(DEBUG_FLGS)
-
-#
-# lint pass one enforcement
-#  
-CFLAGS += $(CCVERBOSE)
-
-#
-#	Default build targets.
-#
-.KEEP_STATE:
-
-def:		$(DEF_DEPS)
-
-all:		$(ALL_DEPS)
-
-clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
-
-clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
-
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
-install:	$(INSTALL_DEPS)
-
-CERRWARN	+= -_gcc=-Wno-uninitialized
-
-#
-#	Include common targets.
-#
-include $(UTSBASE)/sparc/Makefile.targ
-
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-SD_FILES = $(SD_OBJS:%.o=../sd/%.ll)
-SATA_FILES = $(SATA_OBJS:%.o=-l ../sata/%.ll)
-SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
-CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll)
- 
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WLCMD_DIR)/nv_sata.wlcmd $(WARLOCK_OUT)  warlock_ddi.files \
-	sata.files scsi.files sd.files cmlb.files
-	$(WARLOCK) -c $(WLCMD_DIR)/nv_sata.wlcmd $(WARLOCK_OUT) \
-	$(SD_FILES) \
-	$(SCSI_FILES) \
-	$(CMLB_FILES) \
-        $(SATA_FILES) \
-	-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/sata/adapters/nv_sata/%.c
-	$(WLCC) $(CPPFLAGS) -D DEBUG -D __sparcv9 -o $@ $<
-
-sata.files:
-	@cd ../sata; pwd; $(MAKE) warlock
- 
-scsi.files:
-	@cd ../scsi; pwd; $(MAKE) warlock
-
-sd.files: 
-	@cd ../sd; pwd; $(MAKE) warlock_alone
-
-cmlb.files:
-	@cd ../cmlb; pwd; $(MAKE) warlock
-
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/ohci/Makefile b/usr/src/uts/sparc/ohci/Makefile
index a1afa2fa4e..2360e3480c 100644
--- a/usr/src/uts/sparc/ohci/Makefile
+++ b/usr/src/uts/sparc/ohci/Makefile
@@ -38,14 +38,11 @@ UTSBASE	= ../..
 #
 #	Define the module and object file sets.
 #
-MODULE		= ohci 
+MODULE		= ohci
 OBJECTS		= $(OHCI_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(OHCI_OBJS:%.o=$(LINTS_DIR)/%.ln)
-WARLOCK_OUT	= $(OHCI_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/usb/hcd/openhci
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -55,7 +52,7 @@ include $(UTSBASE)/sparc/Makefile.sparc
 #
 # lint pass one enforcement
 #
-CFLAGS += $(CCVERBOSE)   
+CFLAGS += $(CCVERBOSE)
 
 #
 # depends on misc/usba
@@ -85,10 +82,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -102,34 +97,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES = $(USBA_OBJS:%.o= -l ../usba/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ohci.wlcmd warlock_ddi.files \
-	usba.files
-	$(WARLOCK) -c $(WLCMD_DIR)/ohci.wlcmd  $(WARLOCK_OUT) \
-	$(USBA_FILES) \
-	-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/hcd/openhci/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
-
-usba.files:
-	@cd ../usba; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/pmcs/Makefile b/usr/src/uts/sparc/pmcs/Makefile
index 4a963ee1f6..82414a28bf 100644
--- a/usr/src/uts/sparc/pmcs/Makefile
+++ b/usr/src/uts/sparc/pmcs/Makefile
@@ -39,9 +39,6 @@ OBJECTS		= $(PMCS_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(PMCS_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/scsi/adapters/pmcs
-WARLOCK_OUT     = $(PMCS_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Kernel Module Dependencies
diff --git a/usr/src/uts/sparc/rdsv3/Makefile b/usr/src/uts/sparc/rdsv3/Makefile
index 53627981c0..ec1fa4ac0a 100644
--- a/usr/src/uts/sparc/rdsv3/Makefile
+++ b/usr/src/uts/sparc/rdsv3/Makefile
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#	This makefile drives the production of the rds driver 
+#	This makefile drives the production of the rds driver
 #	kernel module.
 #
 #	sparc architecture dependent
@@ -40,9 +40,6 @@ OBJECTS		= $(RDSV3_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(RDSV3_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/ib/clients/rdsv3
-WARLOCK_OUT     = $(RDSV3_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -114,36 +111,3 @@ $(ROOTLINK):	$(ROOT_STRMOD_DIR) $(ROOTMODULE)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#       Defines for local commands.
-#
-WARLOCK         = warlock
-WLCC            = wlcc
-TOUCH           = touch
-TEST            = test
-
-warlock: $(WARLOCK_OK) $(WARLOCK_OUT)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/rdsv3.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/rdsv3.wlcmd $(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/clients/rdsv3/%.c \
-	$(UTSBASE)/common/sys/ib/clients/rdsv3/ib.h \
-	$(UTSBASE)/common/sys/ib/clients/rdsv3/info.h \
-	$(UTSBASE)/common/sys/ib/clients/rdsv3/loop.h \
-	$(UTSBASE)/common/sys/ib/clients/rdsv3/rdma.h \
-	$(UTSBASE)/common/sys/ib/clients/rdsv3/rdma_transport.h \
-	$(UTSBASE)/common/sys/ib/clients/rdsv3/rds.h \
-	$(UTSBASE)/common/sys/ib/clients/rdsv3/rds_rdma.h \
-	$(UTSBASE)/common/sys/ib/clients/rdsv3/rdsv3_atomic.h \
-	$(UTSBASE)/common/sys/ib/clients/rdsv3/rdsv3_debug.h \
-	$(UTSBASE)/common/sys/ib/clients/rdsv3/rdsv3_impl.h \
-	$(UTSBASE)/common/sys/ib/clients/rdsv3/rdsv3_ofed_types.h \
-	$(UTSBASE)/common/sys/ib/clients/rdsv3/rdsv3_sc.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -Dinline=  -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/s1394/Makefile b/usr/src/uts/sparc/s1394/Makefile
index 5ac3270bd3..5122529ec5 100644
--- a/usr/src/uts/sparc/s1394/Makefile
+++ b/usr/src/uts/sparc/s1394/Makefile
@@ -43,8 +43,6 @@ MODULE		= s1394
 OBJECTS		= $(S1394_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(S1394_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT     = $(S1394_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
 
 #
 #	Include common rules.
@@ -100,10 +98,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -117,24 +113,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-
-#
-#	Warlock targets
-#
-warlock: $(MODULE).ok
-
-$(MODULE).ok: $(WARLOCK_OUT) warlock_ddi.files
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/1394/%.c
-	$(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
-
diff --git a/usr/src/uts/sparc/sata/Makefile b/usr/src/uts/sparc/sata/Makefile
deleted file mode 100644
index 7e805ca2f0..0000000000
--- a/usr/src/uts/sparc/sata/Makefile
+++ /dev/null
@@ -1,128 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# uts/sparc/sata/Makefile
-#
-#	This makefile drives the production of the sata "misc"
-#	kernel module.
-#
-#	sparc architecture dependent
-#
-
-#
-#	Path to the base of the uts directory tree (usually /usr/src/uts).
-#
-UTSBASE	= ../..
-
-#
-#	Define the module and object file sets.
-#
-MODULE		= sata
-OBJECTS		= $(SATA_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(SATA_OBJS:%.o=$(LINTS_DIR)/%.ln)
-WARLOCK_OUT     = $(SATA_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-
-#
-#	Include common rules.
-#
-include $(UTSBASE)/sparc/Makefile.sparc
-
-#
-#	Define targets
-#
-ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
-INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
-
-#
-#	Overrides.
-#
-DEBUG_FLGS	=
-DEBUG_DEFS	+= $(DEBUG_FLGS)
-
-#
-# lint pass one enforcement
-#  
-CFLAGS += $(CCVERBOSE)
-
-#
-#	Default build targets.
-#
-.KEEP_STATE:
-
-def:		$(DEF_DEPS)
-
-all:		$(ALL_DEPS)
-
-clean:		$(CLEAN_DEPS); \
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
-
-clobber:	$(CLOBBER_DEPS); \
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
-
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
-install:	$(INSTALL_DEPS)
-
-CERRWARN	+= -_gcc=-Wno-parentheses
-CERRWARN	+= -_gcc=-Wno-unused-label
-CERRWARN	+= -_gcc=-Wno-unused-function
-CERRWARN	+= -_gcc=-Wno-unused-variable
-CERRWARN	+= -_gcc=-Wno-uninitialized
-CERRWARN	+= -_gcc=-Wno-empty-body
-
-#
-#	Include common targets.
-#
-include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#       Defines for local commands.
-#
-WLCC            = wlcc
-TOUCH           = touch
-WARLOCK         = warlock
-
-#
-#       Warlock targets
-#
-
-SATA_FILES = $(SATA_OBJS:%.o=%.ll)
-
-warlock: $(MODULE).ok
-
-%.ok:   $(SATA_FILES)
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/sata/impl/%.c
-	$(WLCC) $(CPPFLAGS) -D __sparcv9 -DDEBUG -o $@ $<
diff --git a/usr/src/uts/sparc/sbp2/Makefile b/usr/src/uts/sparc/sbp2/Makefile
index 05e8615c99..7d3db7b1d2 100644
--- a/usr/src/uts/sparc/sbp2/Makefile
+++ b/usr/src/uts/sparc/sbp2/Makefile
@@ -39,9 +39,6 @@ MODULE		= sbp2
 OBJECTS		= $(SBP2_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(SBP2_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT     = $(SBP2_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -62,9 +59,9 @@ ALL_BUILDS	= $(ALL_BUILDSONLY64)
 DEF_BUILDS	= $(DEF_BUILDSONLY64)
 CLEANLINTFILES	+= $(LINT32_FILES)
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -85,10 +82,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -102,25 +97,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-
-#
-#	Warlock
-#
-WARLOCK_CMD	= $(WLCMD_DIR)/$(MODULE).wlcmd
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK):	$(WARLOCK_OUT) $(WARLOCK_CMD)
-	$(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/sbp2/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
diff --git a/usr/src/uts/sparc/scsa1394/Makefile b/usr/src/uts/sparc/scsa1394/Makefile
index 1c60c4c4da..f8f2543772 100644
--- a/usr/src/uts/sparc/scsa1394/Makefile
+++ b/usr/src/uts/sparc/scsa1394/Makefile
@@ -35,9 +35,6 @@ MODULE		= scsa1394
 OBJECTS		= $(SCSA1394_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(SCSA1394_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT     = $(SCSA1394_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -92,10 +89,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 modlintlib:	$(MODLINTLIB_DEPS) lint32
 
@@ -109,50 +104,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	Warlock targets
-#
-SBP2_FILES = $(SBP2_OBJS:%.o= -l ../sbp2/%.ll)
-SD_FILES   = $(SD_OBJS:%.o=../sd/%.ll)
-SCSI_FILES = $(SCSI_OBJS:%.o= -l ../scsi/%.ll)
-CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) sbp2.files warlock_ddi.files \
-	$(WLCMD_DIR)/scsa1394.wlcmd sd.files scsi.files cmlb.files
-	$(WARLOCK) -c $(WLCMD_DIR)/scsa1394.wlcmd $(WARLOCK_OUT) $(SD_FILES) \
-		$(SCSI_FILES) \
-		$(CMLB_FILES) \
-		$(SBP2_FILES) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/1394/targets/scsa1394/%.c
-	$(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $<
-
-sbp2.files:
-	@cd ../sbp2; pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
-
-sd.files:
-	@cd ../sd; pwd; $(MAKE) warlock_alone
-
-scsi.files:
-	@cd ../scsi; pwd; $(MAKE) warlock
-
-cmlb.files:
-	@cd ../cmlb; pwd; $(MAKE) warlock
-
-
diff --git a/usr/src/uts/sparc/scsa2usb/Makefile b/usr/src/uts/sparc/scsa2usb/Makefile
index 3886f470ef..c122b2b7cb 100644
--- a/usr/src/uts/sparc/scsa2usb/Makefile
+++ b/usr/src/uts/sparc/scsa2usb/Makefile
@@ -44,18 +44,15 @@ OBJECTS		= $(SCSA2USB_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(SCSA2USB_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/usb/scsa2usb
-WARLOCK_OUT	= $(SCSA2USB_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
 #
 include $(UTSBASE)/sparc/Makefile.sparc
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 # depends on misc/usba misc/scsi
@@ -86,10 +83,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -103,78 +98,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-SD_FILES   = $(SD_OBJS:%.o=../sd/%.ll)
-ST_FILES   = $(ST_OBJS:%.o=../st/%.ll)
-SCSI_FILES = $(SCSI_OBJS:%.o= -l ../scsi/%.ll)
-CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll)
-
-warlock: $(WARLOCK_OK) warlock_with_usba
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/scsa2usb.wlcmd warlock_ddi.files \
-	scsi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/scsa2usb.wlcmd $(WARLOCK_OUT)  \
-		../warlock/scsi.ll \
-		-l ../warlock/ddi_dki_impl.ll \
-		$(SCSI_FILES)
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/scsa2usb/%.c \
-		$(UTSBASE)/common/sys/usb/clients/mass_storage/usb_bulkonly.h \
-		$(UTSBASE)/common/sys/usb/clients/mass_storage/usb_cbi.h \
-		$(UTSBASE)/common/sys/usb/scsa2usb/scsa2usb.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_with_usba: $(WLCMD_DIR)/scsa2usb_with_usba.wlcmd  $(WARLOCK_OUT) \
-	usba_files ohci_files ehci_files uhci_files warlock_ddi.files sd.files \
-	st.files scsi.files cmlb.files
-	$(WARLOCK) -c $(WLCMD_DIR)/scsa2usb_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(SD_FILES) \
-		$(ST_FILES) \
-		$(SCSI_FILES) \
-		$(CMLB_FILES) \
-		$(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
-
-scsi.files:
-	@cd ../scsi; pwd; $(MAKE) warlock
-
-sd.files:
-	@cd ../sd; pwd; $(MAKE) warlock_alone
-
-cmlb.files:
-	@cd ../cmlb; pwd; $(MAKE) warlock
-
-st.files:
-	@cd ../st; pwd; $(MAKE) warlock_alone
diff --git a/usr/src/uts/sparc/scsi/Makefile b/usr/src/uts/sparc/scsi/Makefile
index f90607602f..54479da2f5 100644
--- a/usr/src/uts/sparc/scsi/Makefile
+++ b/usr/src/uts/sparc/scsi/Makefile
@@ -43,8 +43,6 @@ MODULE		= scsi
 OBJECTS		= $(SCSI_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(SCSI_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT     = $(SCSI_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
 
 #
 #	Include common rules.
@@ -58,9 +56,9 @@ ALL_TARGET	= $(BINARY)
 LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -86,10 +84,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -103,23 +99,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-
-#
-#	Warlock targets
-#
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT)
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/scsi/impl/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-%.ll: $(UTSBASE)/common/io/scsi/conf/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
diff --git a/usr/src/uts/sparc/sd/Makefile b/usr/src/uts/sparc/sd/Makefile
index ea74399df4..e97a15f713 100644
--- a/usr/src/uts/sparc/sd/Makefile
+++ b/usr/src/uts/sparc/sd/Makefile
@@ -43,9 +43,6 @@ OBJECTS		= $(SD_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(SD_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/sun/io/scsi/targets
-WARLOCK_OUT     = $(SD_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -59,9 +56,9 @@ ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
 LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -89,10 +86,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -106,69 +101,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include	$(UTSBASE)/sparc/Makefile.targ
-
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-# Warlock targets
-#
-# Note that in warlock_with_{esp,isp} it is important to load sd.ll
-# before {isp,esp}.ll; the reason is that both have _init/_info/_fini
-# and warlock can only handle one extern function by a given name;
-# any loaded after the first are ignored.
-
-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
-
-warlock: $(WARLOCK_TARGETS)
-
-warlock_alone: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WLCMD_DIR)/sd.wlcmd $(WARLOCK_OUT) scsi_files \
-	warlock_ddi.files cmlb_files
-	$(WARLOCK) -c $(WLCMD_DIR)/sd.wlcmd $(WARLOCK_OUT) $(SCSI_FILES) \
-		$(CMLB_FILES) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/scsi/targets/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_with_esp: $(WLCMD_DIR)/sd_with_esp.wlcmd $(WARLOCK_OUT) scsi_files \
-	esp_files warlock_ddi.files cmlb_files
-	$(WARLOCK) -c $(WLCMD_DIR)/sd_with_esp.wlcmd \
-		$(WARLOCK_OUT) ../esp/esp $(SCSI_FILES) $(CMLB_FILES) \
-		-l ../warlock/ddi_dki_impl.ll
-
-warlock_with_fas: $(WLCMD_DIR)/sd_with_fas.wlcmd $(WARLOCK_OUT) scsi_files \
-	fas_files warlock_ddi.files cmlb_files
-	$(WARLOCK) -c $(WLCMD_DIR)/sd_with_fas.wlcmd \
-		$(WARLOCK_OUT) ../fas/fas \
-		../fas/fas_callbacks \
-		$(SCSI_FILES) $(CMLB_FILES) \
-		-l ../warlock/ddi_dki_impl.ll
-
-cmlb_files:
-	@cd ../cmlb; pwd; $(MAKE) warlock
-
-
-scsi_files:
-	@cd ../scsi; pwd; $(MAKE) warlock
-
-esp_files:
-	@cd ../esp; pwd; $(MAKE) warlock
-
-fas_files:
-	@cd ../fas; 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 edc95a7b3b..73e29f288d 100644
--- a/usr/src/uts/sparc/ses/Makefile
+++ b/usr/src/uts/sparc/ses/Makefile
@@ -43,9 +43,6 @@ OBJECTS		= $(SES_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(SES_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/sun/io/scsi/targets
-WARLOCK_OUT     = $(SES_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 # Include common rules.
@@ -58,7 +55,6 @@ include $(UTSBASE)/sparc/Makefile.sparc
 ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
 LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
-CLEANFILES	+= $(WARLOCK_TARGETS)
 
 #
 # Define dependency on scsi
@@ -84,10 +80,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 modlintlib:	$(MODLINTLIB_DEPS) lint64
 
@@ -99,58 +93,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-
-#
-# Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-# Warlock targets
-#
-# XXX FIX ME.  this can be improved quite a bit
-
-SES_FILES	= $(MODULE).ll
-SCSI_FILES	= $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
-
-WARLOCK_TARGETS	= $(WARLOCK_OK) warlock_with_esp.ok warlock_with_fas.ok
-
-warlock: $(WARLOCK_TARGETS)
-
-$(WARLOCK_OK): $(WLCMD_DIR)/$(MODULE).wlcmd $(SES_FILES)
-	@cd ../warlock; $(MAKE) warlock
-	@cd ../scsi; $(MAKE) warlock
-	$(WARLOCK) -c $(WLCMD_DIR)/$(MODULE).wlcmd $(SES_FILES) ../warlock/scsi.ll \
-	        -l ../warlock/ddi_dki_impl.ll  \
-	        $(SCSI_FILES)
-	@ $(TOUCH) $@
-
-warlock_with_esp.ok: $(WLCMD_DIR)/ses_with_esp.wlcmd $(SES_FILES)
-	@cd ../warlock; $(MAKE) warlock
-	@cd ../scsi; $(MAKE) warlock
-	@cd ../esp; $(MAKE) warlock;
-	$(WARLOCK) -c $(WLCMD_DIR)/ses_with_esp.wlcmd $(SES_FILES) ../esp/esp  \
-	        ../warlock/scsi.ll \
-	        -l ../warlock/ddi_dki_impl.ll \
-	        $(SCSI_FILES)
-	@ $(TOUCH) $@
-
-warlock_with_fas.ok: $(WLCMD_DIR)/ses_with_fas.wlcmd $(SES_FILES)
-	@cd ../warlock; $(MAKE) warlock
-	@cd ../scsi; $(MAKE) warlock
-	@cd ../fas; $(MAKE) warlock;
-	$(WARLOCK) -c $(WLCMD_DIR)/ses_with_fas.wlcmd $(SES_FILES) \
-	        ../fas/fas ../fas/fas_callbacks \
-	        ../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/si3124/Makefile b/usr/src/uts/sparc/si3124/Makefile
deleted file mode 100644
index 482a4b1781..0000000000
--- a/usr/src/uts/sparc/si3124/Makefile
+++ /dev/null
@@ -1,147 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# uts/sparc/si3124/Makefile
-#
-#	This makefile drives the production of the 
-#	"platform/i86pc/kernel/drv/si3124" kernel module.
-#
-#	sparc architecture dependent
-#
-
-#
-#	Path to the base of the uts directory tree (usually /usr/src/uts).
-#
-UTSBASE	= ../..
-
-#
-#	Define the module and object file sets.
-#
-MODULE		= si3124
-OBJECTS		= $(SI3124_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(SI3124_OBJS:%.o=$(LINTS_DIR)/%.ln)
-WARLOCK_OUT     = $(SI3124_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-CONF_SRCDIR     = $(UTSBASE)/common/io/sata/adapters/si3124
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
-
-#
-#	Include common rules.
-#
-include $(UTSBASE)/sparc/Makefile.sparc
-
-#
-#	Define targets
-#
-ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
-INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
-
-#
-#	Overrides.
-#
-DEBUG_FLGS	=
-DEBUG_DEFS	+= $(DEBUG_FLGS)
-
-CERRWARN	+= -_gcc=-Wno-uninitialized
-
-#
-# lint pass one enforcement
-#  
-CFLAGS += $(CCVERBOSE)
-
-#
-#	Default build targets.
-#
-.KEEP_STATE:
-
-def:		$(DEF_DEPS)
-
-all:		$(ALL_DEPS)
-
-clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
-
-clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
-
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
-install:	$(INSTALL_DEPS)
-
-#
-#	Include common targets.
-#
-include $(UTSBASE)/sparc/Makefile.targ
-
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-SD_FILES = $(SD_OBJS:%.o=../sd/%.ll)
-SATA_FILES = $(SATA_OBJS:%.o=-l ../sata/%.ll)
-SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
-CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WLCMD_DIR)/si3124.wlcmd $(WARLOCK_OUT) warlock_ddi.files \
-	sata.files scsi.files sd.files cmlb.files
-	$(WARLOCK) -c $(WLCMD_DIR)/si3124.wlcmd $(WARLOCK_OUT) \
-	$(SD_FILES) \
-	$(SCSI_FILES) \
-	$(CMLB_FILES) \
-        $(SATA_FILES) \
-	-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/sata/adapters/si3124/%.c
-	$(WLCC) $(CPPFLAGS) -D DEBUG -D __sparcv9 -o $@ $<
-
-sata.files:
-	@cd ../sata; pwd; $(MAKE) warlock
-
-scsi.files:
-	@cd ../scsi; pwd; $(MAKE) warlock
-
-sd.files: 
-	@cd ../sd; pwd; $(MAKE) warlock_alone
-
-cmlb.files:
-	@cd ../cmlb; pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/sol_ofs/Makefile b/usr/src/uts/sparc/sol_ofs/Makefile
index 5f8ebb6a6e..31d0f9ca94 100644
--- a/usr/src/uts/sparc/sol_ofs/Makefile
+++ b/usr/src/uts/sparc/sol_ofs/Makefile
@@ -36,9 +36,7 @@ OBJECTS		= $(SOL_OFS_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(SOL_OFS_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
 LDFLAGS		+= -dy -Nmisc/ibtl -Nmisc/ibcm
-WARLOCK_OUT	= $(SOL_OFS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
+
 #
 #	Include common rules.
 #
@@ -76,10 +74,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -93,25 +89,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#       Defines for local commands.
-#
-WARLOCK         = warlock
-WLCC            = wlcc
-TOUCH           = touch
-TEST            = test
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/sol_ofs.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/sol_ofs.wlcmd $(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/clients/of/sol_ofs/%.c \
-	$(UTSBASE)/common/sys/ib/clients/of/sol_ofs/sol_uverbs.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/sol_ucma/Makefile b/usr/src/uts/sparc/sol_ucma/Makefile
index 9a9cbae186..d263e60262 100644
--- a/usr/src/uts/sparc/sol_ucma/Makefile
+++ b/usr/src/uts/sparc/sol_ucma/Makefile
@@ -37,9 +37,7 @@ LINTS		= $(SOL_UCMA_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 LDFLAGS		+= -dy -Nmisc/sol_ofs
 CONF_SRCDIR	= $(UTSBASE)/common/io/ib/clients/of/sol_ucma
-WARLOCK_OUT	= $(SOL_UCMA:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
+
 #
 #	Include common rules.
 #
@@ -76,10 +74,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -93,25 +89,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#       Defines for local commands.
-#
-WARLOCK         = warlock
-WLCC            = wlcc
-TOUCH           = touch
-TEST            = test
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/sol_ucma.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/sol_ucma.wlcmd $(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/clients/of/sol_ucma/%.c \
-	$(UTSBASE)/common/sys/ib/clients/of/sol_ucma/sol_ucma.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/sol_uverbs/Makefile b/usr/src/uts/sparc/sol_uverbs/Makefile
index ed3626eb42..67ea35fb18 100644
--- a/usr/src/uts/sparc/sol_uverbs/Makefile
+++ b/usr/src/uts/sparc/sol_uverbs/Makefile
@@ -37,9 +37,7 @@ LINTS		= $(SOL_UVERBS_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 LDFLAGS		+= -dy -Nmisc/ibtl -Nmisc/sol_ofs
 CONF_SRCDIR	= $(UTSBASE)/common/io/ib/clients/of/sol_uverbs
-WARLOCK_OUT	= $(SOL_UVERBS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
+
 #
 #	Include common rules.
 #
@@ -76,10 +74,8 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -93,25 +89,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#       Defines for local commands.
-#
-WARLOCK         = warlock
-WLCC            = wlcc
-TOUCH           = touch
-TEST            = test
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/sol_uverbs.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/sol_uverbs.wlcmd $(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/clients/of/sol_uverbs/%.c \
-	$(UTSBASE)/common/sys/ib/clients/of/sol_uverbs/sol_uverbs.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/ssd/Makefile b/usr/src/uts/sparc/ssd/Makefile
index d73bd3a5b3..47159b3ba3 100644
--- a/usr/src/uts/sparc/ssd/Makefile
+++ b/usr/src/uts/sparc/ssd/Makefile
@@ -45,9 +45,6 @@ OBJECTS		= $(SSD_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(SSD_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/sun/io/scsi/targets
-WARLOCK_OUT     = ssd.ll 
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -61,9 +58,9 @@ ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
 LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE) -D__fibre -dalign
 LINTFLAGS += -D__fibre
 WLCCFLAGS = -D__fibre
@@ -100,10 +97,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -117,46 +112,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include	$(UTSBASE)/sparc/Makefile.targ
-
-browser:	$(BINARY)
-
-browser		:= CFLAGS += -xsb
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-# Warlock targets
-
-SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
-CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll)
-
-warlock: warlock_alone
-
-warlock_alone: $(WARLOCK_OK)
-
-scsi_files:
-	@cd ../scsi; pwd; $(MAKE) warlock
-
-cmlb_files:
-	 @cd ../cmlb; pwd; $(MAKE) warlock
-
-$(WARLOCK_OK): $(WLCMD_DIR)/ssd.wlcmd $(WARLOCK_OUT) scsi.files cmlb_files
-	$(WARLOCK) -c $(WLCMD_DIR)/ssd.wlcmd $(WARLOCK_OUT) \
-	$(SCSI_FILES) $(CMLB_FILES) \
-	-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-ssd.ll: $(UTSBASE)/common/io/scsi/targets/sd.c
-	$(WLCC) $(CPPFLAGS) $(WLCCFLAGS) -DDEBUG -o $@ $(UTSBASE)/common/io/scsi/targets/sd.c 
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
-
-scsi.files:
-	@cd ../scsi; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/st/Makefile b/usr/src/uts/sparc/st/Makefile
index 03140e9e18..21f51215d6 100644
--- a/usr/src/uts/sparc/st/Makefile
+++ b/usr/src/uts/sparc/st/Makefile
@@ -42,9 +42,6 @@ OBJECTS		= $(ST_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(ST_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/sun/io/scsi/targets
-WARLOCK_OUT     = $(ST_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -58,9 +55,9 @@ ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
 LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -91,10 +88,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -107,64 +102,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-# Warlock targets
-#
-# Note that in warlock_with_{esp,isp} it is important to load st.ll
-# before {isp,esp}.ll; the reason is that both have _init/_info/_fini
-# and warlock can only handle one extern function by a given name;
-# any loaded after the first are ignored.
-
-SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
-
-WARLOCK_TARGETS =  warlock_alone warlock_with_esp warlock_with_fas
-
-warlock: $(WARLOCK_TARGETS)
-
-warlock_alone: $(WARLOCK_OK)
-
-warlock_with_esp: $(WLCMD_DIR)/st_with_esp.wlcmd $(WARLOCK_OUT) scsi_files \
-	esp_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/st_with_esp.wlcmd \
-		$(WARLOCK_OUT) ../esp/esp $(SCSI_FILES)  \
-		-l ../warlock/ddi_dki_impl.ll
-
-warlock_with_fas: $(WLCMD_DIR)/st_with_fas.wlcmd $(WARLOCK_OUT) scsi_files \
-	fas_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/st_with_fas.wlcmd \
-		$(WARLOCK_OUT) \
-		../fas/fas ../fas/fas_callbacks \
-		$(SCSI_FILES)  \
-		-l ../warlock/ddi_dki_impl.ll
-
-scsi_files:
-	@cd ../scsi; pwd; $(MAKE) warlock
-
-esp_files:
-	@cd ../esp; pwd; $(MAKE) warlock
-
-fas_files:
-	@cd ../fas; 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
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/scsi/targets/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
-
-scsi.files:
-	@cd ../scsi; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/tavor/Makefile b/usr/src/uts/sparc/tavor/Makefile
index 8f03fa6db4..7bd88686ea 100644
--- a/usr/src/uts/sparc/tavor/Makefile
+++ b/usr/src/uts/sparc/tavor/Makefile
@@ -42,9 +42,6 @@ LINTS		= $(TAVOR_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/ib/adapters/tavor
 LDFLAGS		+= -dy -Ndrv/ib -Nmisc/ibtl -Nmisc/ibmf
-WARLOCK_OUT     = $(TAVOR_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -71,9 +68,9 @@ CLEANLINTFILES	+= $(LINT32_FILES)
 #DEBUG_DEFS_DBG32 += -DTNF_DEBUG
 #DEBUG_DEFS_DBG64 += -DTNF_DEBUG
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -102,10 +99,8 @@ all:		$(ALL_DEPS)
 lint:		$(LINT_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 modlintlib:	$(MODLINTLIB_DEPS) lint32
 
@@ -117,27 +112,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-TEST		= test
-
-#
-#	Warlock targets
-#
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/tavor.wlcmd
-	$(WARLOCK) -c $(WLCMD_DIR)/tavor.wlcmd $(WARLOCK_OUT) \
-		-l $(UTSBASE)/sparc/warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/ib/adapters/tavor/%.c
-	$(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd $(UTSBASE)/sparc/warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/tem/Makefile b/usr/src/uts/sparc/tem/Makefile
index 838a4a6a00..1a9dcb12e1 100644
--- a/usr/src/uts/sparc/tem/Makefile
+++ b/usr/src/uts/sparc/tem/Makefile
@@ -44,9 +44,6 @@ OBJECTS		= $(TEM_OBJS:%=$(OBJS_DIR)/%) $(FONT_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(TEM_OBJS:%.o=$(LINTS_DIR)/%.ln)
 LINTS		+= $(FONT_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WARLOCK_OUT	= $(TEM_OBJS:%.o=%.ll) $(FONT_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -103,26 +100,3 @@ include $(UTSBASE)/sparc/Makefile.targ
 CLOBBERFILES	+=	\
 	$(OBJS_DIR)/$(VGATEXT_FONT).o \
 	$(OBJS_DIR)/$(VGATEXT_FONT).c
-
-#
-#	Defines for local commands
-#
-TEST		= test
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-
-#
-#	warlock targets
-#
-
-warlock:	$(WARLOCK_OUT) warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/tem.wlcmd $(WARLOCK_OUT) \
-	-l ../../sparc/warlock/ddi_dki_impl.ll
-	$(TOUCH) $(WARLOCK_OK)
-
-%.ll:	$(UTSBASE)/common/io/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../../sparc/warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/ugen/Makefile b/usr/src/uts/sparc/ugen/Makefile
index f8988fea49..3b494749cc 100644
--- a/usr/src/uts/sparc/ugen/Makefile
+++ b/usr/src/uts/sparc/ugen/Makefile
@@ -43,18 +43,15 @@ MODULE		= ugen
 OBJECTS		= $(UGEN_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(UGEN_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT     = $(UGEN_OBJS:%.o=%.ll)
-WARLOCK_OK      = $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
 #
 include $(UTSBASE)/sparc/Makefile.sparc
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 CERRWARN	+= -_gcc=-Wno-uninitialized
 
@@ -77,10 +74,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -94,54 +89,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK)  warlock_with_usba
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ugen.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/ugen.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/clients/ugen/%.c \
-		$(UTSBASE)/common/sys/usb/clients/ugen/ugend.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-
-warlock_with_usba: $(WLCMD_DIR)/ugen_with_usba.wlcmd  $(WARLOCK_OUT) \
-	usba_files ohci_files ehci_files uhci_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/ugen_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(WARLOCK_OUT) \
-	-l ../warlock/ddi_dki_impl.ll
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
-
diff --git a/usr/src/uts/sparc/uhci/Makefile b/usr/src/uts/sparc/uhci/Makefile
index ebc994f8cb..efd8d429f8 100644
--- a/usr/src/uts/sparc/uhci/Makefile
+++ b/usr/src/uts/sparc/uhci/Makefile
@@ -38,14 +38,11 @@ UTSBASE	= ../..
 #
 #	Define the module and object file sets.
 #
-MODULE		= uhci 
+MODULE		= uhci
 OBJECTS		= $(UHCI_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(UHCI_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/usb/hcd/uhci
-WARLOCK_OUT	= $(UHCI_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -55,7 +52,7 @@ include $(UTSBASE)/sparc/Makefile.sparc
 #
 # lint pass one enforcement
 #
-CFLAGS += $(CCVERBOSE)   
+CFLAGS += $(CCVERBOSE)
 
 #
 # depends on misc/usba
@@ -85,10 +82,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -102,34 +97,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES = $(USBA_OBJS:%.o= -l ../usba/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/uhci.wlcmd warlock_ddi.files \
-	usba.files
-	$(WARLOCK) -c $(WLCMD_DIR)/uhci.wlcmd  $(WARLOCK_OUT) \
-	$(USBA_FILES) \
-	-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/hcd/uhci/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
-
-usba.files:
-	@cd ../usba; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/usb_ac/Makefile b/usr/src/uts/sparc/usb_ac/Makefile
index 3aee852b0e..1cb5902777 100644
--- a/usr/src/uts/sparc/usb_ac/Makefile
+++ b/usr/src/uts/sparc/usb_ac/Makefile
@@ -42,9 +42,6 @@ OBJECTS		= $(USB_AC_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USB_AC_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/usb/clients/audio/usb_ac
-WARLOCK_OUT	= $(USB_AC_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -85,10 +82,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -102,59 +97,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES	= $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES	= $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES	= $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES	= $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-
-#
-#	Warlock targets
-#
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK):	$(WARLOCK_OUT) warlock_ddi.files \
-	warlock_standalone warlock_usba.files warlock_with_usba
-	$(TOUCH) $(WARLOCK_OK)
-
-
-warlock_with_usba: $(WLCMD_DIR)/usb_ac_with_usba.wlcmd  $(WARLOCK_OUT) \
-	warlock_ddi.files warlock_usba.files warlock_ohci.files \
-	warlock_ehci.files warlock_uhci.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usb_ac_with_usba.wlcmd \
-	$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-	$(WARLOCK_OUT)  -l ../warlock/ddi_dki_impl.ll
-
-warlock_standalone: $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/usb_ac.wlcmd
-	$(WARLOCK) -c $(WLCMD_DIR)/usb_ac.wlcmd $(WARLOCK_OUT) \
-	-l ../warlock/ddi_dki_impl.ll
-
-%.ll: $(UTSBASE)/common/io/usb/clients/audio/usb_ac/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_usba.files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-warlock_ohci.files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-warlock_uhci.files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-warlock_ehci.files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/usb_ah/Makefile b/usr/src/uts/sparc/usb_ah/Makefile
index ac5e14c875..d01c42d896 100644
--- a/usr/src/uts/sparc/usb_ah/Makefile
+++ b/usr/src/uts/sparc/usb_ah/Makefile
@@ -41,18 +41,15 @@ MODULE		= usb_ah
 OBJECTS		= $(USB_AH_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USB_AH_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_STRMOD_DIR)/$(MODULE)
-WARLOCK_OUT	= $(USB_AH_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
 #
 include $(UTSBASE)/sparc/Makefile.sparc
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -83,10 +80,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -100,29 +95,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usb_ah.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usb_ah.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/clients/audio/usb_ah/%.c \
-		$(UTSBASE)/common/sys/usb/clients/audio/usb_ah/usb_ah.h
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
-
diff --git a/usr/src/uts/sparc/usb_as/Makefile b/usr/src/uts/sparc/usb_as/Makefile
index 4261e3a0ea..75b280aea7 100644
--- a/usr/src/uts/sparc/usb_as/Makefile
+++ b/usr/src/uts/sparc/usb_as/Makefile
@@ -43,18 +43,15 @@ MODULE		= usb_as
 OBJECTS		= $(USB_AS_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USB_AS_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT	= $(USB_AS_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
 #
 include $(UTSBASE)/sparc/Makefile.sparc
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -83,10 +80,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -100,60 +95,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES	= $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES	= $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES	= $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES	= $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-
-#
-#	Warlock targets
-#
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK):	$(WARLOCK_OUT) warlock_ddi.files \
-	warlock_standalone warlock_usba.files warlock_with_usba
-	$(TOUCH) $(WARLOCK_OK)
-
-
-warlock_with_usba: $(WLCMD_DIR)/usb_as_with_usba.wlcmd $(WARLOCK_OUT) \
-	warlock_ddi.files warlock_ohci.files warlock_usba.files \
-	warlock_ehci.files warlock_uhci.files 
-	$(WARLOCK) -c $(WLCMD_DIR)/usb_as_with_usba.wlcmd \
-	$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-	$(WARLOCK_OUT)  -l ../warlock/ddi_dki_impl.ll
-
-warlock_standalone: $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/usb_as.wlcmd
-	$(WARLOCK) -c $(WLCMD_DIR)/usb_as.wlcmd $(WARLOCK_OUT) \
-	-l ../warlock/ddi_dki_impl.ll
-
-%.ll: $(UTSBASE)/common/io/usb/clients/audio/usb_as/%.c
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-
-warlock_usba.files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-warlock_ohci.files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-warlock_uhci.files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-warlock_ehci.files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	@cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/usb_ia/Makefile b/usr/src/uts/sparc/usb_ia/Makefile
index 2d39cf236d..bbb641d95f 100644
--- a/usr/src/uts/sparc/usb_ia/Makefile
+++ b/usr/src/uts/sparc/usb_ia/Makefile
@@ -43,18 +43,15 @@ MODULE		= usb_ia
 OBJECTS		= $(USB_IA_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USB_IA_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT	= $(USB_IA_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
 #
 include $(UTSBASE)/sparc/Makefile.sparc
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -76,10 +73,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -93,53 +88,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK) warlock_with_usba
-
-$(WARLOCK_OK): $(WARLOCK_OUT)  $(WLCMD_DIR)/usb_ia.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usb_ia.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/usb_ia/%.c \
-		$(UTSBASE)/common/sys/usb/usb_ia/usb_iavar.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_with_usba: $(WLCMD_DIR)/usb_ia_with_usba.wlcmd  $(WARLOCK_OUT) \
-	usba_files ohci_files ehci_files uhci_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usb_ia_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/usb_mid/Makefile b/usr/src/uts/sparc/usb_mid/Makefile
index 954e558785..a1b63e810d 100644
--- a/usr/src/uts/sparc/usb_mid/Makefile
+++ b/usr/src/uts/sparc/usb_mid/Makefile
@@ -43,18 +43,15 @@ MODULE		= usb_mid
 OBJECTS		= $(USB_MID_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USB_MID_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT	= $(USB_MID_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
 #
 include $(UTSBASE)/sparc/Makefile.sparc
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -76,10 +73,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -93,52 +88,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK) warlock_with_usba
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usb_mid.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usb_mid.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/usb_mid/%.c \
-		$(UTSBASE)/common/sys/usb/usb_mid/usb_midvar.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_with_usba: $(WLCMD_DIR)/usb_mid_with_usba.wlcmd  $(WARLOCK_OUT) \
-	usba_files ohci_files ehci_files uhci_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usb_mid_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/usba/Makefile b/usr/src/uts/sparc/usba/Makefile
index 044e1a3067..e90778e3ac 100644
--- a/usr/src/uts/sparc/usba/Makefile
+++ b/usr/src/uts/sparc/usba/Makefile
@@ -39,8 +39,6 @@ UTSBASE	= ../..
 MODULE		= usba
 OBJECTS		= $(USBA_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USBA_OBJS:%.o=$(LINTS_DIR)/%.ln)
-WARLOCK_OUT	= $(USBA_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
 
 #
@@ -48,9 +46,9 @@ ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
 #
 include $(UTSBASE)/sparc/Makefile.sparc
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 CERRWARN	+= -_gcc=-Wno-uninitialized
@@ -73,11 +71,9 @@ all:		$(ALL_DEPS)
 
 def:		$(DEF_DEPS)
 
-clean:		$(CLEAN_DEPS); \
-                $(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
+clean:		$(CLEAN_DEPS)
 
-clobber:	$(CLOBBER_DEPS); \
-                $(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
+clobber:	$(CLOBBER_DEPS)
 
 lint:		$(LINT_DEPS)
 
@@ -91,24 +87,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-
-#
-#	Warlock targets
-#
-
-USBA_FILES = $(USBA_OBJS:%.o=%.ll)
-
-warlock: $(MODULE).ok 
-
-%.ok:	$(USBA_FILES)
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/usba/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
diff --git a/usr/src/uts/sparc/usbecm/Makefile b/usr/src/uts/sparc/usbecm/Makefile
index 4762360a0a..e4bfdcb03f 100644
--- a/usr/src/uts/sparc/usbecm/Makefile
+++ b/usr/src/uts/sparc/usbecm/Makefile
@@ -39,9 +39,6 @@ MODULE		= usbecm
 OBJECTS		= $(USBECM_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USBECM_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT	= $(USBECM_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -69,10 +66,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -86,52 +81,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-TEST		= test
-
-#
-#	warlock
-#
-WARLOCK_CMD	= $(WLCMD_DIR)/$(MODULE).wlcmd
-
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK) warlock_with_usba
-
-%.ll: $(UTSBASE)/common/io/usb/clients/usbecm/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usbecm.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbecm.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-warlock_with_usba: $(WLCMD_DIR)/usbecm_with_usba.wlcmd $(WARLOCK_OUT) \
-	usba_files ohci_files uhci_files ehci_files \
-	warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbecm_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/usbftdi/Makefile b/usr/src/uts/sparc/usbftdi/Makefile
index 54b0fcc5b9..8a7e1b41d9 100644
--- a/usr/src/uts/sparc/usbftdi/Makefile
+++ b/usr/src/uts/sparc/usbftdi/Makefile
@@ -38,11 +38,8 @@ UTSBASE	= ../..
 MODULE		= usbftdi
 OBJECTS		= $(USBFTDI_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USBFTDI_OBJS:%.o=$(LINTS_DIR)/%.ln)
-WARLOCK_OUT     = $(USBFTDI_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/usb/clients/usbser/usbftdi
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -67,10 +64,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -84,60 +79,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-TEST		= test
-
-#
-#	warlock
-#
-WARLOCK_CMD	= $(WLCMD_DIR)/$(MODULE).wlcmd
-USBSER_FILES = $(USBSER_OBJS:%.o=../usbser/%.ll)
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): warlock_with_usba warlock_with_usbser
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/clients/usbser/usbftdi/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_with_usbser: $(WARLOCK_OUT) usbser_files warlock_ddi.files \
-	$(WARLOCK_CMD)
-	$(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \
-		$(USBSER_FILES) -l ../warlock/ddi_dki_impl.ll
-
-warlock_with_usba:  $(WARLOCK_OUT) usbser_files \
-	$(WLCMD_DIR)/usbftdi_with_usba.wlcmd usba_files ohci_files uhci_files \
-	ehci_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbftdi_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(USBSER_FILES) \
-		$(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll
-
-usbser_files:
-	@cd ../usbser; pwd; $(MAKE) warlock
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/usbprn/Makefile b/usr/src/uts/sparc/usbprn/Makefile
index 0fa8ce7e0c..8a797f86b8 100644
--- a/usr/src/uts/sparc/usbprn/Makefile
+++ b/usr/src/uts/sparc/usbprn/Makefile
@@ -41,18 +41,15 @@ MODULE		= usbprn
 OBJECTS		= $(USBPRN_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USBPRN_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT	= $(USBPRN_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
 #
 include $(UTSBASE)/sparc/Makefile.sparc
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -73,10 +70,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -90,52 +85,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK) warlock_with_usba
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usbprn.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbprn.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/clients/printer/%.c \
-		$(UTSBASE)/common/sys/usb/clients/printer/usbprn.h
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_with_usba: $(WLCMD_DIR)/usbprn_with_usba.wlcmd  $(WARLOCK_OUT) \
-	usba_files ohci_files ehci_files uhci_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbprn_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(WARLOCK_OUT) \
-	-l ../warlock/ddi_dki_impl.ll
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/usbsacm/Makefile b/usr/src/uts/sparc/usbsacm/Makefile
index 9c569539ce..3805e59c8b 100644
--- a/usr/src/uts/sparc/usbsacm/Makefile
+++ b/usr/src/uts/sparc/usbsacm/Makefile
@@ -39,18 +39,15 @@ MODULE		= usbsacm
 OBJECTS		= $(USBSACM_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USBSACM_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT	= $(USBSACM_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
 #
 include $(UTSBASE)/sparc/Makefile.sparc
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 LDFLAGS         += -dy -Nmisc/usba -Nmisc/usbser
@@ -71,10 +68,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -88,61 +83,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-TEST		= test
-
-#
-#	warlock
-#
-WARLOCK_CMD	= $(WLCMD_DIR)/$(MODULE).wlcmd
-
-USBSER_FILES = $(USBSER_OBJS:%.o=../usbser/%.ll)
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): warlock_with_usbser warlock_with_usba
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/clients/usbser/usbsacm/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_with_usbser: $(WARLOCK_OUT) usbser_files warlock_ddi.files \
-	$(WARLOCK_CMD)
-	$(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \
-		$(USBSER_FILES) -l ../warlock/ddi_dki_impl.ll
-
-warlock_with_usba: $(WLCMD_DIR)/usbsacm_with_usba.wlcmd $(WARLOCK_OUT) \
-	usbser_files usba_files ohci_files uhci_files ehci_files \
-	warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbsacm_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(USBSER_FILES) \
-		$(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll
-
-usbser_files:
-	@cd ../usbser; pwd; $(MAKE) warlock
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/usbser/Makefile b/usr/src/uts/sparc/usbser/Makefile
index bb60d82cea..56f053c4cb 100644
--- a/usr/src/uts/sparc/usbser/Makefile
+++ b/usr/src/uts/sparc/usbser/Makefile
@@ -39,19 +39,16 @@ UTSBASE	= ../..
 MODULE		= usbser
 OBJECTS		= $(USBSER_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USBSER_OBJS:%.o=$(LINTS_DIR)/%.ln)
-WARLOCK_OUT	= $(USBSER_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
 #
 include $(UTSBASE)/sparc/Makefile.sparc
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -84,10 +81,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -101,29 +96,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-TEST		= test
-
-#
-#	Warlock
-#
-WARLOCK_CMD	= $(WLCMD_DIR)/$(MODULE).wlcmd
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK):	$(WARLOCK_OUT) $(WARLOCK_CMD) warlock_ddi.files
-	$(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/clients/usbser/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/usbskel/Makefile b/usr/src/uts/sparc/usbskel/Makefile
index 664cf2fa17..627b16e9d9 100644
--- a/usr/src/uts/sparc/usbskel/Makefile
+++ b/usr/src/uts/sparc/usbskel/Makefile
@@ -44,18 +44,15 @@ OBJECTS		= $(USBSKEL_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USBSKEL_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR     = $(UTSBASE)/common/io/usb/clients/usbskel
-WARLOCK_OUT	= $(USBSKEL_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
 #
 include $(UTSBASE)/sparc/Makefile.sparc
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -77,10 +74,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -94,54 +89,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK) warlock_with_usba
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usbskel.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbskel.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/clients/usbskel/%.c \
-		$(UTSBASE)/common/sys/usb/clients/usbskel/usbskel.h
-	$(WLCC)  $(CPPFLAGS) -DDEBUG -DUSBSKEL_PM -DUSBSKEL_CPR -o $@ $<
-
-
-warlock_with_usba: $(WLCMD_DIR)/usbskel_with_usba.wlcmd $(WARLOCK_OUT) \
-	usba_files ohci_files ehci_files uhci_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbskel_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(WARLOCK_OUT) \
-	-l ../warlock/ddi_dki_impl.ll
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
-
diff --git a/usr/src/uts/sparc/usbsksp/Makefile b/usr/src/uts/sparc/usbsksp/Makefile
index 28c036c0bc..951860f774 100644
--- a/usr/src/uts/sparc/usbsksp/Makefile
+++ b/usr/src/uts/sparc/usbsksp/Makefile
@@ -42,18 +42,15 @@ MODULE		= usbsksp
 OBJECTS		= $(USBSER_KEYSPAN_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USBSER_KEYSPAN_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT     = $(USBSER_KEYSPAN_OBJS:%.o=%.ll) 
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
 #
 include $(UTSBASE)/sparc/Makefile.sparc
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 LDFLAGS         += -dy -Nmisc/usba -Nmisc/usbser -Nmisc/usbs49_fw
@@ -72,10 +69,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -91,60 +86,3 @@ install:	$(INSTALL_DEPS)
 include $(UTSBASE)/sparc/Makefile.targ
 
 CERRWARN	+= -_gcc=-Wno-uninitialized
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-TEST		= test
-
-#
-#	warlock
-#
-WARLOCK_CMD	= $(WLCMD_DIR)/usbser_keyspan.wlcmd
-USBSER_FILES = $(USBSER_OBJS:%.o=../usbser/%.ll)
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): warlock_with_usba warlock_with_usbser
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/clients/usbser/usbser_keyspan/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_with_usbser: $(WARLOCK_OUT) usbser_files warlock_ddi.files \
-	$(WARLOCK_CMD)
-	$(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \
-		$(USBSER_FILES) -l ../warlock/ddi_dki_impl.ll
-
-warlock_with_usba: $(WLCMD_DIR)/usbser_keyspan_with_usba.wlcmd $(WARLOCK_OUT) \
-	usbser_files usba_files ohci_files uhci_files ehci_files \
-	warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbser_keyspan_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(USBSER_FILES) \
-		$(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll
-
-usbser_files:
-	@cd ../usbser; pwd; $(MAKE) warlock
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/usbsprl/Makefile b/usr/src/uts/sparc/usbsprl/Makefile
index e359afcab0..6ecac0694f 100644
--- a/usr/src/uts/sparc/usbsprl/Makefile
+++ b/usr/src/uts/sparc/usbsprl/Makefile
@@ -40,18 +40,15 @@ MODULE		= usbsprl
 OBJECTS		= $(USBSPRL_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USBSPRL_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT     = $(USBSPRL_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
 #
 include $(UTSBASE)/sparc/Makefile.sparc
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 CERRWARN	+= -_gcc=-Wno-uninitialized
@@ -72,10 +69,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -89,60 +84,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-TEST		= test
-
-#
-#	warlock
-#
-WARLOCK_CMD	= $(WLCMD_DIR)/$(MODULE).wlcmd
-USBSER_FILES = $(USBSER_OBJS:%.o=../usbser/%.ll)
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK)
-
-$(WARLOCK_OK): warlock_with_usbser warlock_with_usba
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/clients/usbser/usbsprl/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_with_usbser: $(WARLOCK_OUT) usbser_files warlock_ddi.files \
-	$(WARLOCK_CMD)
-	$(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \
-		$(USBSER_FILES) -l ../warlock/ddi_dki_impl.ll
-
-warlock_with_usba: $(WLCMD_DIR)/usbsprl_with_usba.wlcmd $(WARLOCK_OUT) \
-	usbser_files usba_files ohci_files uhci_files ehci_files \
-	warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbsprl_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(USBSER_FILES) \
-		$(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll
-
-usbser_files:
-	@cd ../usbser; pwd; $(MAKE) warlock
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/usbvc/Makefile b/usr/src/uts/sparc/usbvc/Makefile
index 42f280d785..eb747fe312 100644
--- a/usr/src/uts/sparc/usbvc/Makefile
+++ b/usr/src/uts/sparc/usbvc/Makefile
@@ -45,18 +45,15 @@ MODULE		= usbvc
 OBJECTS		= $(USBVC_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USBVC_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-WARLOCK_OUT	= $(USBVC_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
 #
 include $(UTSBASE)/sparc/Makefile.sparc
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -85,10 +82,8 @@ all:		$(ALL_DEPS)
 def:		$(DEF_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -102,52 +97,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-#
-#	lock_lint rules
-#
-USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
-UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
-OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
-EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
-
-warlock: $(WARLOCK_OK) warlock_with_usba
-
-$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usbvc.wlcmd warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbvc.wlcmd $(WARLOCK_OUT)  \
-		-l ../warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/usb/clients/video/usbvc/%.c \
-		$(UTSBASE)/common/sys/usb/clients/video/usbvc/usbvc_var.h
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock_with_usba: $(WLCMD_DIR)/usbvc_with_usba.wlcmd $(WARLOCK_OUT) \
-	usba_files ohci_files ehci_files uhci_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/usbvc_with_usba.wlcmd \
-		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(WARLOCK_OUT) \
-	-l ../warlock/ddi_dki_impl.ll
-
-usba_files:
-	@cd ../usba;pwd; $(MAKE) warlock
-
-uhci_files:
-	@cd ../uhci;pwd; $(MAKE) warlock
-
-ohci_files:
-	@cd ../ohci;pwd; $(MAKE) warlock
-
-ehci_files:
-	@cd ../ehci;pwd; $(MAKE) warlock
-
-warlock_ddi.files:
-	cd ../warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/warlock/Makefile b/usr/src/uts/sparc/warlock/Makefile
deleted file mode 100644
index 3fcb2bfb7e..0000000000
--- a/usr/src/uts/sparc/warlock/Makefile
+++ /dev/null
@@ -1,118 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#	sparc architecture dependent
-#
-# uts/sparc/warlock/Makefile
-#
-#	Path to the base of the uts directory tree (usually /usr/src/uts).
-#
-UTSBASE = ../..
-
-#
-#	Define the module and object file sets.
-#
-MODULE		= warlock
-ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-
-.KEEP_STATE:
-
-CFLAGS += -I../../common/sys -I../../sun/sys/scsi -D_KERNEL
-#
-#	Defines for local commands.
-#
-WARLOCK		= warlock
-WLCC		= wlcc
-TOUCH		= touch
-TEST		= test
-
-include $(UTSBASE)/sparc/Makefile.sparc
-
-#
-#	lock_lint rules
-#
-all:	warlock warlock.1394 warlock.ecpp warlock.scsi \
-	warlock.usb warlock.ib warlock.sata warlock.wc
-
-warlock: $(MODULE).ok 
-
-warlock.ok: ddi_dki_impl.ll scsi.ll
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/common/io/warlock/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-warlock.usb:
-	@cd ../usba; $(MAKE) clean; $(MAKE) warlock
-	@cd ../ohci; $(MAKE) clean; $(MAKE) warlock
-	@cd ../uhci; $(MAKE) clean; $(MAKE) warlock
-	@cd ../ehci; $(MAKE) clean; $(MAKE) warlock
-	@cd ../hid; $(MAKE) clean; $(MAKE) warlock
-	@cd ../scsa2usb; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usb_ac; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usb_as; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usb_ah; $(MAKE) clean; $(MAKE) warlock
-	@cd ../ugen; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usb_mid; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usb_ia; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usbprn; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usbser; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usbsksp; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usbsprl; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usbsacm; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usbecm; $(MAKE) clean; $(MAKE) warlock
-	@cd ../usbskel; $(MAKE) clean; $(MAKE) warlock
-
-warlock.scsi:
-	@cd ../dad; $(MAKE) clean; $(MAKE) warlock
-	@cd ../dada; $(MAKE) clean; $(MAKE) warlock
-	@cd ../esp; $(MAKE) clean; $(MAKE) warlock
-	@cd ../fas; $(MAKE) clean; $(MAKE) warlock
-	@cd ../sd; $(MAKE) clean; $(MAKE) warlock
-	@cd ../ses; $(MAKE) clean; $(MAKE) warlock
-	@cd ../st; $(MAKE) clean; $(MAKE) warlock
-	@cd ../ssd; $(MAKE) clean; $(MAKE) warlock
-
-warlock.1394:
-	@cd ../s1394; $(MAKE) clean; $(MAKE) warlock
-	@cd ../hci1394; $(MAKE) clean; $(MAKE) warlock
-	@cd ../scsa1394; $(MAKE) clean; $(MAKE) warlock
-	@cd ../av1394; $(MAKE) clean; $(MAKE) warlock
-
-warlock.ecpp:
-	@cd ../ecpp; $(MAKE) clean; $(MAKE) warlock
-
-warlock.ib:
-	@cd ../ibmf; $(MAKE) clean; $(MAKE) warlock
-	@cd ../ib; $(MAKE) clean; $(MAKE) warlock
-	@cd ../ibtl; $(MAKE) clean; $(MAKE) warlock
-	@cd ../ibcm; $(MAKE) clean; $(MAKE) warlock
-	@cd ../ibd; $(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
-
-warlock.wc:
-	@cd ../wc; $(MAKE) clean; $(MAKE) warlock
diff --git a/usr/src/uts/sparc/wc/Makefile b/usr/src/uts/sparc/wc/Makefile
index 86d8563330..2e6438cff9 100644
--- a/usr/src/uts/sparc/wc/Makefile
+++ b/usr/src/uts/sparc/wc/Makefile
@@ -41,9 +41,6 @@ OBJECTS		= $(WC_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(WC_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/sun/io
-WARLOCK_OUT	= $(WC_OBJS:%.o=%.ll)
-WARLOCK_OK	= $(MODULE).ok
-WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -97,37 +94,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sparc/Makefile.targ
-
-#
-#	Defines for local commands
-#
-TEST		= test
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-
-#
-#	warlock targets
-#
-
-#
-# vcons_conf.c is compiled to genunix, add it to WARLOCK_OUT
-#
-WARLOCK_OUT	+= vcons_conf.ll
-
-warlock:	$(WARLOCK_OUT) sdev_vtops.file  warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/wc.wlcmd $(WARLOCK_OUT) \
-	-l ../../sparc/warlock/ddi_dki_impl.ll
-	$(WARLOCK) -c $(WLCMD_DIR)/wc_devfs.wlcmd sdev_vtops.ll vcons_conf.ll \
-	-l ../../sparc/warlock/ddi_dki_impl.ll
-	$(TOUCH) $(WARLOCK_OK)
-
-%.ll:	$(UTSBASE)/common/io/%.c
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-sdev_vtops.file:
-	$(WLCC) $(CPPFLAGS) -DDEBUG -o sdev_vtops.ll -c \
-	../../common/fs/dev/sdev_vtops.c
-
-warlock_ddi.files:
-	@cd ../../sparc/warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/sun/io/scsi/inc.flg b/usr/src/uts/sun/io/scsi/inc.flg
index 8d33ea8f71..4b1eb82868 100644
--- a/usr/src/uts/sun/io/scsi/inc.flg
+++ b/usr/src/uts/sun/io/scsi/inc.flg
@@ -24,12 +24,11 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# This file brings down all that is needed to build just 
+# This file brings down all that is needed to build just
 # SCSI Subsystem.
 #
 
 find_files "s.*"	\
-	usr/src/uts/common/io/warlock \
 	usr/src/uts/common/io/scsi \
 	usr/src/uts/common/sys \
 	usr/src/uts/sparc/dada	\
@@ -39,7 +38,6 @@ find_files "s.*"	\
 	usr/src/uts/sparc/ses	\
 	usr/src/uts/sparc/ssd	\
 	usr/src/uts/sparc/st	\
-	usr/src/uts/sparc/warlock \
 	usr/src/uts/sun/io/dada \
 	usr/src/uts/sun/sys/dada \
 	usr/src/uts/sun/sys/scsi
diff --git a/usr/src/uts/sun4u/i2bsc/Makefile b/usr/src/uts/sun4u/i2bsc/Makefile
index 0c984165b1..5db65683dc 100644
--- a/usr/src/uts/sun4u/i2bsc/Makefile
+++ b/usr/src/uts/sun4u/i2bsc/Makefile
@@ -22,7 +22,6 @@
 # Copyright 2007 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 i2bsc nexus driver.
 #
@@ -44,9 +43,9 @@ CONF_SRCDIR	= $(UTSBASE)/sun4u/io/i2c/nexus
 #
 include $(UTSBASE)/sun4u/Makefile.sun4u
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE) -I$(UTSBASE)/sun4u
 
 LDFLAGS += -dy -N misc/i2c_svc
@@ -86,27 +85,6 @@ clean.lint:	$(CLEAN_LINT_DEPS)
 install:	$(INSTALL_DEPS)
 
 #
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-
-#
-#	Warlock targets
-#
-
-I2BSC = $(I2BSC_OBJS:%.o=%.ll)
-
-warlock: $(MODULE).ok 
-
-%.ok:	$(I2BSC_FILES)
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/sun4u/io/i2c/nexus/i2bsc/%.c
-	$(WLCC) $(CFLAGS) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-#
 #	Include common targets
 #
 include $(UTSBASE)/sun4u/Makefile.targ
diff --git a/usr/src/uts/sun4u/i2c_svc/Makefile b/usr/src/uts/sun4u/i2c_svc/Makefile
index 3803d9691d..f17f211c52 100644
--- a/usr/src/uts/sun4u/i2c_svc/Makefile
+++ b/usr/src/uts/sun4u/i2c_svc/Makefile
@@ -1,6 +1,4 @@
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 
@@ -23,9 +21,9 @@ ROOTMODULE	= $(ROOT_PSM_MISC_DIR)/$(MODULE)
 #
 include $(UTSBASE)/sun4u/Makefile.sun4u
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 LDFLAGS += -dy
@@ -59,24 +57,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sun4u/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-
-#
-#	Warlock targets
-#
-
-I2C_SVC_FILES = $(I2C_SVC_OBJS:%.o=%.ll)
-
-warlock: $(MODULE).ok 
-
-%.ok:	$(I2C_SVC_FILES)
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/sun4u/io/i2c/misc/%.c
-	$(WLCC) $(CFLAGS) $(CPPFLAGS) -DDEBUG -o $@ $<
diff --git a/usr/src/uts/sun4u/montecarlo/acebus/Makefile b/usr/src/uts/sun4u/montecarlo/acebus/Makefile
index 90d0438d14..03b756c375 100644
--- a/usr/src/uts/sun4u/montecarlo/acebus/Makefile
+++ b/usr/src/uts/sun4u/montecarlo/acebus/Makefile
@@ -97,23 +97,3 @@ LINT_LIB_DIR    = $(MONTECARLO_LINT_LIB_DIR)
 #	Include common targets.
 #
 include $(UTSBASE)/sun4u/montecarlo/Makefile.targ
-
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-
-#
-#	Warlock targets
-#
-
-ACEBUS_FILES = $(ACEBUS_OBJS:%.o=%.ll)
-
-warlock: $(MODULE).ok 
-
-%.ok:	$(ACEBUS_FILES)
-	$(TOUCH) $@
-
-%.ll:	$(UTSBASE)/sun4u/montecarlo/io/%.c
-	$(WLCC) $(CFLAGS) $(CPPFLAGS) -DDEBUG -o $@ $<
diff --git a/usr/src/uts/sun4u/montecarlo/scsb/Makefile b/usr/src/uts/sun4u/montecarlo/scsb/Makefile
index 3076c9dbb6..e20ca311ff 100644
--- a/usr/src/uts/sun4u/montecarlo/scsb/Makefile
+++ b/usr/src/uts/sun4u/montecarlo/scsb/Makefile
@@ -101,23 +101,3 @@ LINT_LIB_DIR    = $(MONTECARLO_LINT_LIB_DIR)
 #	Include common targets.
 #
 include $(UTSBASE)/sun4u/montecarlo/Makefile.targ
-
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-
-#
-#	Warlock targets
-#
-
-SCSB_FILES = $(SCSB_OBJS:%.o=%.ll)
-
-warlock: $(MODULE).ok 
-
-%.ok:	$(SCSB_FILES)
-	$(TOUCH) $@
-
-%.ll:	$(UTSBASE)/sun4u/montecarlo/io/%.c
-	$(WLCC) $(CFLAGS) $(CPPFLAGS) -DDEBUG -o $@ $<
diff --git a/usr/src/uts/sun4u/pcf8584/Makefile b/usr/src/uts/sun4u/pcf8584/Makefile
index bc08343e64..7134c7a6f0 100644
--- a/usr/src/uts/sun4u/pcf8584/Makefile
+++ b/usr/src/uts/sun4u/pcf8584/Makefile
@@ -19,8 +19,6 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 
@@ -43,9 +41,9 @@ ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 #
 include $(UTSBASE)/sun4u/Makefile.sun4u
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE) -I../../sun4u
 
 LDFLAGS += -dy -N misc/i2c_svc
@@ -83,27 +81,6 @@ clean.lint:	$(CLEAN_LINT_DEPS)
 install:	$(INSTALL_DEPS)
 
 #
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-
-#
-#	Warlock targets
-#
-
-PCF8584 = $(PCF8584_OBJS:%.o=%.ll)
-
-warlock: $(MODULE).ok 
-
-%.ok:	$(PCF8584_FILES)
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/sun4u/io/i2c/nexus/pcf8584/%.c
-	$(WLCC) $(CFLAGS) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-#
 #	Include common targets
 #
 include $(UTSBASE)/sun4u/Makefile.targ
diff --git a/usr/src/uts/sun4u/seeprom/Makefile b/usr/src/uts/sun4u/seeprom/Makefile
index df05378e64..a1c1fd4712 100644
--- a/usr/src/uts/sun4u/seeprom/Makefile
+++ b/usr/src/uts/sun4u/seeprom/Makefile
@@ -43,9 +43,9 @@ ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 #
 include $(UTSBASE)/sun4u/Makefile.sun4u
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 LDFLAGS += -dy -N misc/i2c_svc
@@ -88,32 +88,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sun4u/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-
-#
-#	Warlock targets
-#
-
-SEEPROM_FILES = $(SEEPROM_OBJS:%.o=%.ll)
-
-warlock: $(MODULE).ok 
-	warlock -c seeprom.wlcmd $(SEEPROM_FILES) \
-		-l ../../sparc/warlock/ddi_dki_impl.ll
-	$(TOUCH) $@
-
-# i2c_svc_files warlock_ddi_files
-
-warlock_with_svc: $(SEEPROM_FILES) 	
-	$(WARLOCK) -c seeprom.wlcmd $(SEEPROM_FILES) ../i2c_svc/i2c_svc.ll \
-		-l ../../sparc/warlock/ddi_dki_impl.ll
-
-%.ok:	$(SEEPROM_FILES)
-
-%.ll: $(UTSBASE)/sun4u/io/i2c/clients/%.c
-	$(WLCC) $(CFLAGS) $(CPPFLAGS) -DDEBUG -o $@ $< 
diff --git a/usr/src/uts/sun4u/smbus/Makefile b/usr/src/uts/sun4u/smbus/Makefile
index d60bf5af4f..95db67bdd6 100644
--- a/usr/src/uts/sun4u/smbus/Makefile
+++ b/usr/src/uts/sun4u/smbus/Makefile
@@ -19,8 +19,6 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 
@@ -43,9 +41,9 @@ ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 #
 include $(UTSBASE)/sun4u/Makefile.sun4u
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE) -I../../sun4u
 
 LDFLAGS += -dy -N misc/i2c_svc
@@ -83,27 +81,6 @@ clean.lint:	$(CLEAN_LINT_DEPS)
 install:	$(INSTALL_DEPS)
 
 #
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-
-#
-#	Warlock targets
-#
-
-SMBUS = $(SMBUS_OBJS:%.o=%.ll)
-
-warlock: $(MODULE).ok 
-
-%.ok:	$(SMBUS_FILES)
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/sun4u/io/i2c/nexus/smbus/%.c
-	$(WLCC) $(CFLAGS) $(CPPFLAGS) -DDEBUG -o $@ $<
-
-#
 #	Include common targets
 #
 include $(UTSBASE)/sun4u/Makefile.targ
diff --git a/usr/src/uts/sun4u/tda8444/Makefile b/usr/src/uts/sun4u/tda8444/Makefile
index 8ee945ed0c..544faf4462 100644
--- a/usr/src/uts/sun4u/tda8444/Makefile
+++ b/usr/src/uts/sun4u/tda8444/Makefile
@@ -20,8 +20,6 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
@@ -45,9 +43,9 @@ ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 #
 include $(UTSBASE)/sun4u/Makefile.sun4u
 
-# 
-# lint pass one enforcement 
-# 
+#
+# lint pass one enforcement
+#
 CFLAGS += $(CCVERBOSE)
 
 LDFLAGS += -dy -N misc/i2c_svc
@@ -81,24 +79,3 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/sun4u/Makefile.targ
-
-#
-#	Defines for local commands.
-#
-WLCC		= wlcc
-TOUCH		= touch
-WARLOCK		= warlock
-
-#
-#	Warlock targets
-#
-
-TDA8444 = $(TDA8444_OBJS:%.o=%.ll)
-
-warlock: $(MODULE).ok 
-
-%.ok:	$(TDA8444_FILES)
-	$(TOUCH) $@
-
-%.ll: $(UTSBASE)/sun4u/io/i2c/clients/tda8444/%.c
-	$(WLCC) $(CFLAGS) $(CPPFLAGS) -DDEBUG -o $@ $<