Merge branch 'master' into OS-8149OS-8149

5 files changed, 2 insertions, 49 deletions

diff --git a/usr/src/uts/sun4u/boston/Makefile b/usr/src/uts/sun4u/boston/Makefile
index 77a8dbdc0a..417eb3a663 100644
--- a/usr/src/uts/sun4u/boston/Makefile
+++ b/usr/src/uts/sun4u/boston/Makefile
@@ -46,12 +46,8 @@ install		:=	TARGET= install
 install_h	:=	TARGET= install_h
 clean		:=	TARGET= clean
 clobber		:=	TARGET= clobber
-lint		:=	TARGET= lint
-lintlib		:=	TARGET= lintlib
-modlintlib	:=	TARGET= modlintlib
 modlist		:=	TARGET= modlist
 modlist		:=	NO_STATE= -K $$MODSTATE$$$$
-clean.lint	:=	TARGET= clean.lint
 check		:=	TARGET= check
 
 #
@@ -59,9 +55,7 @@ check		:=	TARGET= check
 #
 .KEEP_STATE:
 
-def all clean clean.lint clobber modlist: $(BOSTON_KMODS)
-
-modlintlib:	$(BOSTON_KMODS)
+def all clean clobber modlist: $(BOSTON_KMODS)
 
 install:	$(ROOT_BOSTON_DIR) \
 		$(USR_BOSTON_DIR) \
@@ -74,24 +68,6 @@ install:	$(ROOT_BOSTON_DIR) \
 
 check install_h:
 
-lint:		modlintlib
-
-#
-# The 'lint.platmod' target lints the boston platform module against the sun4u
-# kernel.  This ends up doing all the kernel cross-checks, so it takes a couple
-# of minutes.  Due to the low ROI, it's not run by default, but it's a good
-# idea to run this if you change os/boston.c.
-#
-LINT_LIBS	 = $(LINT_LIB) \
-		   -L$(BOSTON_LINT_LIB_DIR) \
-		   -L$(LINT_LIB_DIR) $(LINT_KMODS:%=-l%) \
-			$(CLOSED_LINT_KMODS:%=-l%) \
-		   -L$(SPARC_LIB_DIR) $(SPARC_LINTS:%=-l%)
-
-lint.platmod:	modlintlib
-	@-$(ECHO) "\nBoston Platform-dependent module: global crosschecks:"
-	@-$(LINT) $(LINTFLAGS) $(LINT_LIBS) 2>&1 | $(LGREP.2)
-
 $(BOSTON_KMODS): FRC
 	@cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 
diff --git a/usr/src/uts/sun4u/boston/Makefile.boston b/usr/src/uts/sun4u/boston/Makefile.boston
index ab809b8a13..c8710a1e39 100644
--- a/usr/src/uts/sun4u/boston/Makefile.boston
+++ b/usr/src/uts/sun4u/boston/Makefile.boston
@@ -54,8 +54,6 @@ USR_BOSTON_SBIN_PRTDIAG	= $(USR_BOSTON_SBIN_DIR)/prtdiag
 USR_BOSTON_SBIN_FRUADM	= $(USR_BOSTON_SBIN_DIR)/fruadm
 USR_BOSTON_LIB_DIR	= $(USR_BOSTON_DIR)/lib
 
-BOSTON_LINT_LIB_DIR= $(UTSBASE)/$(PLATFORM)/boston/lint-libs/$(OBJS_DIR)
-
 #
 # Define objects.
 #
diff --git a/usr/src/uts/sun4u/boston/Makefile.rules b/usr/src/uts/sun4u/boston/Makefile.rules
index f37fe504fc..b0f82cf17f 100644
--- a/usr/src/uts/sun4u/boston/Makefile.rules
+++ b/usr/src/uts/sun4u/boston/Makefile.rules
@@ -23,8 +23,6 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 #	This Makefile defines the build rules for the directory
@@ -45,10 +43,3 @@
 $(OBJS_DIR)/%.o:	$(UTSBASE)/sun4u/boston/os/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
-
-#
-#	Section 1b: Lint `object' build rules
-#
-
-$(LINTS_DIR)/%.ln:	$(UTSBASE)/sun4u/boston/os/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
diff --git a/usr/src/uts/sun4u/boston/os/boston.c b/usr/src/uts/sun4u/boston/os/boston.c
index 119e5d2f7b..2862266b10 100644
--- a/usr/src/uts/sun4u/boston/os/boston.c
+++ b/usr/src/uts/sun4u/boston/os/boston.c
@@ -51,7 +51,7 @@ int (*rmc_req_now)(rmc_comm_msg_t *, uint8_t) = NULL;
 void
 startup_platform(void)
 {
-	mutex_init(&mi2cv_mutex, NULL, NULL, NULL);
+	mutex_init(&mi2cv_mutex, NULL, MUTEX_ADAPTIVE, NULL);
 }
 
 int
diff --git a/usr/src/uts/sun4u/boston/platmod/Makefile b/usr/src/uts/sun4u/boston/platmod/Makefile
index df85dff684..e9f4b8dfbc 100644
--- a/usr/src/uts/sun4u/boston/platmod/Makefile
+++ b/usr/src/uts/sun4u/boston/platmod/Makefile
@@ -40,7 +40,6 @@ UTSBASE	= ../../..
 #
 MODULE		= platmod
 OBJECTS		= $(BOSTON_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(BOSTON_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_BOSTON_MISC_DIR)/$(MODULE)
 
 PLAT_DIR	= .
@@ -60,12 +59,8 @@ CLEANFILES	+= $(PLATLIB) $(SYM_MOD)
 #	Define targets
 #
 ALL_TARGET	= $(SYM_MOD)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
-#
-# lint pass one enforcement
-#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -81,17 +76,10 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS)
 
 check:
 
-LINT_LIB_DIR	= $(BOSTON_LINT_LIB_DIR)
 
 $(PLATLIB):	$(OBJECTS)
 	$(BUILD.SO) $(OBJECTS)