6529244 warlock warning on sd related changes with cmlb

8 files changed, 56 insertions, 16 deletions

diff --git a/usr/src/uts/intel/ahci/Makefile b/usr/src/uts/intel/ahci/Makefile
index 008a62959c..14643d2c64 100644
--- a/usr/src/uts/intel/ahci/Makefile
+++ b/usr/src/uts/intel/ahci/Makefile
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -129,6 +129,7 @@ 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)
 
@@ -137,10 +138,11 @@ warlock: $(WARLOCK_OK)
 
 
 $(WARLOCK_OK): ahci.wlcmd $(WARLOCK_OUT)  warlock_ddi.files \
-	sata.files scsi.files sd.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) $@
@@ -157,5 +159,8 @@ scsi.files:
 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/scsa1394/Makefile b/usr/src/uts/intel/scsa1394/Makefile
index 918d3bb467..657c034087 100644
--- a/usr/src/uts/intel/scsa1394/Makefile
+++ b/usr/src/uts/intel/scsa1394/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -109,6 +109,7 @@ TEST		= test
 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)
 
@@ -116,9 +117,10 @@ warlock: $(WARLOCK_OK)
 	cd $(WLCMD_DIR); $(TEST) -f $@  || $(SCCS) get $@
 
 $(WARLOCK_OK): $(WARLOCK_OUT) sbp2.files warlock_ddi.files scsa1394.wlcmd \
-	sd.files scsi.files
+	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) $@
@@ -138,4 +140,6 @@ sd.files:
 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 bbc80a5ae9..3f32844ff5 100644
--- a/usr/src/uts/intel/scsa2usb/Makefile
+++ b/usr/src/uts/intel/scsa2usb/Makefile
@@ -20,7 +20,7 @@
 #
 #
 # uts/intel/scsa2usb/Makefile
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -127,6 +127,7 @@ 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
 
@@ -150,11 +151,12 @@ $(WARLOCK_OK): $(WARLOCK_OUT) scsa2usb.wlcmd warlock_ddi.files \
 warlock_with_usba: 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 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
@@ -182,3 +184,6 @@ sd.files:
 
 st.files:
 	@cd ../st; pwd; $(MAKE) warlock_alone
+
+cmlb.files:
+	 @cd ../cmlb; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/si3124/Makefile b/usr/src/uts/intel/si3124/Makefile
index dc5d18d91f..6e227f171b 100644
--- a/usr/src/uts/intel/si3124/Makefile
+++ b/usr/src/uts/intel/si3124/Makefile
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -129,6 +129,7 @@ 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)
 
@@ -137,10 +138,11 @@ warlock: $(WARLOCK_OK)
 
 
 $(WARLOCK_OK): si3124.wlcmd $(WARLOCK_OUT)  warlock_ddi.files \
-	sata.files scsi.files sd.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) $@
@@ -157,5 +159,8 @@ scsi.files:
 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/ahci/Makefile b/usr/src/uts/sparc/ahci/Makefile
index fdbd3a7a22..5b0ee8f072 100644
--- a/usr/src/uts/sparc/ahci/Makefile
+++ b/usr/src/uts/sparc/ahci/Makefile
@@ -19,7 +19,7 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -115,6 +115,7 @@ 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)
 
@@ -122,10 +123,11 @@ warlock: $(WARLOCK_OK)
 	cd $(WLCMD_DIR); $(TEST) -f $@  || $(SCCS) get $@
 
 $(WARLOCK_OK): ahci.wlcmd $(WARLOCK_OUT)  warlock_ddi.files \
-	sata.files scsi.files sd.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) $@
@@ -142,5 +144,9 @@ scsi.files:
 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/scsa1394/Makefile b/usr/src/uts/sparc/scsa1394/Makefile
index 7562390b96..5cb23287f2 100644
--- a/usr/src/uts/sparc/scsa1394/Makefile
+++ b/usr/src/uts/sparc/scsa1394/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -124,6 +124,7 @@ TEST		= test
 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)
 
@@ -131,9 +132,10 @@ warlock: $(WARLOCK_OK)
 	cd $(WLCMD_DIR); $(TEST) -f $@  || $(SCCS) get $@
 
 $(WARLOCK_OK): $(WARLOCK_OUT) sbp2.files warlock_ddi.files scsa1394.wlcmd \
-	sd.files scsi.files
+	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) $@
@@ -153,4 +155,7 @@ sd.files:
 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 6f72ba27a7..f6e33ed272 100644
--- a/usr/src/uts/sparc/scsa2usb/Makefile
+++ b/usr/src/uts/sparc/scsa2usb/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # uts/sparc/scsa2usb/Makefile
@@ -123,6 +123,7 @@ 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
 
@@ -145,12 +146,13 @@ $(WARLOCK_OK): $(WARLOCK_OUT) scsa2usb.wlcmd warlock_ddi.files \
 
 warlock_with_usba: scsa2usb_with_usba.wlcmd  $(WARLOCK_OUT) usba_files \
 	ohci_files ehci_files uhci_files warlock_ddi.files sd.files st.files \
-	scsi.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
 
@@ -175,5 +177,8 @@ scsi.files:
 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/si3124/Makefile b/usr/src/uts/sparc/si3124/Makefile
index 0204fc2236..434bc17bcc 100644
--- a/usr/src/uts/sparc/si3124/Makefile
+++ b/usr/src/uts/sparc/si3124/Makefile
@@ -19,7 +19,7 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -115,6 +115,7 @@ 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)
 
@@ -122,10 +123,11 @@ warlock: $(WARLOCK_OK)
 	cd $(WLCMD_DIR); $(TEST) -f $@  || $(SCCS) get $@
 
 $(WARLOCK_OK): si3124.wlcmd $(WARLOCK_OUT)  warlock_ddi.files \
-	sata.files scsi.files sd.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) $@
@@ -142,5 +144,8 @@ scsi.files:
 sd.files: 
 	@cd ../sd; pwd; $(MAKE) warlock_alone
 
+cmlb.files:
+	@cd ../cmlb; pwd; $(MAKE) warlock
+
 warlock_ddi.files:
 	@cd ../warlock; pwd; $(MAKE) warlock