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

8 files changed, 16 insertions, 112 deletions

diff --git a/usr/src/uts/sun4u/excalibur/Makefile b/usr/src/uts/sun4u/excalibur/Makefile
index 9c110d7809..ea5b6dc325 100644
--- a/usr/src/uts/sun4u/excalibur/Makefile
+++ b/usr/src/uts/sun4u/excalibur/Makefile
@@ -24,8 +24,6 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
 #	This makefile drives the production of the sun4u excalibur platform
 #	module.
 #
@@ -48,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
 
 #
@@ -61,9 +55,7 @@ check		:=	TARGET= check
 #
 .KEEP_STATE:
 
-def all clean clean.lint clobber modlist: $(EXCALIBUR_KMODS)
-
-modlintlib:	$(EXCALIBUR_KMODS)
+def all clean clobber modlist: $(EXCALIBUR_KMODS)
 
 install:	$(ROOT_EXCALIBUR_DIR) \
 		$(USR_EXCALIBUR_DIR) \
@@ -75,24 +67,6 @@ install:	$(ROOT_EXCALIBUR_DIR) \
 
 check install_h:
 
-lint:		modlintlib
-
-#
-# The 'lint.platmod' target lints the excalibur 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/excalibur.c.
-#
-LINT_LIBS	 = $(LINT_LIB) \
-		   -L$(EXCALIBUR_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) "\nExcalibur Platform-dependent module: global crosschecks:"
-	@-$(LINT) $(LINTFLAGS) $(LINT_LIBS) 2>&1 | $(LGREP.2)
-
 $(EXCALIBUR_KMODS): FRC
 	@cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 
diff --git a/usr/src/uts/sun4u/excalibur/Makefile.excalibur b/usr/src/uts/sun4u/excalibur/Makefile.excalibur
index c40920b6c5..b8a9a707e9 100644
--- a/usr/src/uts/sun4u/excalibur/Makefile.excalibur
+++ b/usr/src/uts/sun4u/excalibur/Makefile.excalibur
@@ -19,12 +19,10 @@
 # CDDL HEADER END
 #
 #
-# uts/sun4u/excalibur/Makefile.excalibur
-#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 #	Global definitions for sun4u implementation specific modules.
 #
@@ -56,8 +54,6 @@ USR_EXCALIBUR_ISYS_DIR	= $(USR_EXCALIBUR_INC_DIR)/sys
 USR_EXCALIBUR_SBIN_DIR	= $(USR_EXCALIBUR_DIR)/sbin
 USR_EXCALIBUR_LIB_DIR	= $(USR_EXCALIBUR_DIR)/lib
 
-EXCALIBUR_LINT_LIB_DIR= $(UTSBASE)/$(PLATFORM)/excalibur/lint-libs/$(OBJS_DIR)
-
 #
 # Define objects.
 #
@@ -79,13 +75,3 @@ include $(UTSBASE)/sun4u/excalibur/Makefile.files
 #	Include common rules.
 #
 include $(UTSBASE)/sun4u/Makefile.sun4u
-
-#
-# For now, disable these lint checks; maintainers should endeavor
-# 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_PTRDIFF_OVERFLOW
-LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
-
diff --git a/usr/src/uts/sun4u/excalibur/Makefile.rules b/usr/src/uts/sun4u/excalibur/Makefile.rules
index 1605380df7..fc3f1ca16e 100644
--- a/usr/src/uts/sun4u/excalibur/Makefile.rules
+++ b/usr/src/uts/sun4u/excalibur/Makefile.rules
@@ -23,7 +23,7 @@
 # Copyright 1999-2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 #	This Makefile defines the build rules for the directory
 #	uts/sun4u/excalibur.
@@ -50,15 +50,3 @@ $(OBJS_DIR)/%.o:		$(UTSBASE)/sun4u/excalibur/io/%.c
 $(OBJS_DIR)/%.o:		$(UTSBASE)/sun4u/excalibur/os/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
-
-#
-#	Section 1b: Lint `object' build rules
-#
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/sun4u/io/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:	$(UTSBASE)/sun4u/excalibur/io/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/sun4u/excalibur/os/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
diff --git a/usr/src/uts/sun4u/excalibur/io/xcalwd.c b/usr/src/uts/sun4u/excalibur/io/xcalwd.c
index a712ae5102..62cb0aaa70 100644
--- a/usr/src/uts/sun4u/excalibur/io/xcalwd.c
+++ b/usr/src/uts/sun4u/excalibur/io/xcalwd.c
@@ -196,7 +196,7 @@ _info(struct modinfo *modinfop)
 /*ARGSUSED*/
 static int
 xcalwd_getinfo(dev_info_t *dip, ddi_info_cmd_t cmd,
-	void *arg, void **resultp)
+    void *arg, void **resultp)
 {
 	int	retval;
 	dev_t	dev = (dev_t)arg;
@@ -255,7 +255,7 @@ xcalwd_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)
 		}
 
 		if (ddi_create_minor_node(dip, MINOR_DEVICE_NAME,
-		    S_IFCHR, instance, DDI_PSEUDO, NULL) == DDI_FAILURE) {
+		    S_IFCHR, instance, DDI_PSEUDO, 0) == DDI_FAILURE) {
 			cmn_err(CE_WARN, "create minor node failed\n");
 			return (DDI_FAILURE);
 		}
@@ -396,7 +396,7 @@ xcalwd_close(dev_t dev, int flag, int otyp, cred_t *credp)
 /*ARGSUSED*/
 static int
 xcalwd_ioctl(dev_t dev, int cmd, intptr_t arg, int flag,
-			cred_t *cred_p, int *rvalp)
+    cred_t *cred_p, int *rvalp)
 {
 	int		instance;
 	xcalwd_state_t	*tsp;
diff --git a/usr/src/uts/sun4u/excalibur/os/excalibur.c b/usr/src/uts/sun4u/excalibur/os/excalibur.c
index 2727e25ac3..9dd7b33a13 100644
--- a/usr/src/uts/sun4u/excalibur/os/excalibur.c
+++ b/usr/src/uts/sun4u/excalibur/os/excalibur.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysmacros.h>
@@ -66,7 +64,7 @@ static xcalfan_info_t xcalfans[] = {
 void
 startup_platform(void)
 {
-	mutex_init(&excal_pcf8584_mutex, NULL, NULL, NULL);
+	mutex_init(&excal_pcf8584_mutex, NULL, MUTEX_ADAPTIVE, NULL);
 }
 
 int
@@ -185,7 +183,7 @@ plat_get_mem_unum(int synd_code, uint64_t flt_addr, int flt_bus_id,
 {
 	if (flt_in_memory && (p2get_mem_unum != NULL))
 		return (p2get_mem_unum(synd_code, P2ALIGN(flt_addr, 8),
-			buf, buflen, lenp));
+		    buf, buflen, lenp));
 	else
 		return (ENOTSUP);
 }
diff --git a/usr/src/uts/sun4u/excalibur/platmod/Makefile b/usr/src/uts/sun4u/excalibur/platmod/Makefile
index dca804a517..38c08a830a 100644
--- a/usr/src/uts/sun4u/excalibur/platmod/Makefile
+++ b/usr/src/uts/sun4u/excalibur/platmod/Makefile
@@ -41,7 +41,6 @@ UTSBASE	= ../../..
 #
 MODULE		= platmod
 OBJECTS		= $(EXCALIBUR_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(EXCALIBUR_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_EXCALIBUR_MISC_DIR)/$(MODULE)
 
 PLAT_DIR	= .
@@ -61,12 +60,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)
 
 #
@@ -82,17 +77,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	= $(EXCALIBUR_LINT_LIB_DIR)
 
 $(PLATLIB):	$(OBJECTS)
 	$(BUILD.SO) $(OBJECTS)
diff --git a/usr/src/uts/sun4u/excalibur/xcalppm/Makefile b/usr/src/uts/sun4u/excalibur/xcalppm/Makefile
index 719ffcf517..f3a1771af3 100644
--- a/usr/src/uts/sun4u/excalibur/xcalppm/Makefile
+++ b/usr/src/uts/sun4u/excalibur/xcalppm/Makefile
@@ -40,7 +40,6 @@ UTSBASE	= ../../..
 #
 MODULE		= xcalppm
 OBJECTS		= $(XCALPPM_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(XCALPPM_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_EXCALIBUR_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/sun4u/excalibur/io
 
@@ -49,19 +48,21 @@ CONF_SRCDIR	= $(UTSBASE)/sun4u/excalibur/io
 #
 include $(UTSBASE)/sun4u/excalibur/Makefile.excalibur
 
-CLEANLINTFILES	= $(LINTS) $(PPM_LINT_LIBS)
-CLEANFILES	= $(OBJECTS) $(CLEANLINTFILES)
+CLEANFILES	= $(OBJECTS)
 CLOBBERFILES	= $(OBJS_DIR)/$(MODULE) $(CLEANFILES)
 
 #
 # Define targets
 #
 ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
 #
-# lint pass one enforcement
+#
+# For now, disable these warnings; maintainers should endeavor
+# to investigate and remove these for maximum coverage.
+# Please do not carry these forward to new Makefiles.
+#
 #
 CFLAGS += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-parentheses
@@ -76,7 +77,7 @@ CFLAGS += -dalign
 #
 # dependency
 #
-LDFLAGS += -dy -Ndrv/schppm
+LDFLAGS += -Ndrv/schppm
 
 #
 #	Default build targets.
@@ -87,21 +88,13 @@ def:		$(DEF_DEPS)
 
 all:		$(ALL_DEPS)
 
-lint:		$(LINT_DEPS)
 
 clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:           $(LINT_DEPS)
-
-modlintlib:     $(MODLINTLIB_DEPS)
-
-clean.lint:     $(CLEAN_LINT_DEPS)
-
 install:        $(INSTALL_DEPS)
 
-LINT_LIB_DIR    = $(EXCALIBUR_LINT_LIB_DIR)
 
 #
 #	Include common targets.
diff --git a/usr/src/uts/sun4u/excalibur/xcalwd/Makefile b/usr/src/uts/sun4u/excalibur/xcalwd/Makefile
index 98d81b9af3..afa3326d6f 100644
--- a/usr/src/uts/sun4u/excalibur/xcalwd/Makefile
+++ b/usr/src/uts/sun4u/excalibur/xcalwd/Makefile
@@ -23,10 +23,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# uts/sun4u/excalibur/xcalwd/Makefile
-#
 
 #
 #	Path to the base of the uts directory tree (usually /usr/src/uts).
@@ -39,7 +35,6 @@ UTSBASE	= ../../..
 MODULE		= xcalwd
 XCALWD_OBJS		= xcalwd.o
 OBJECTS		= $(XCALWD_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(XCALWD_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_EXCALIBUR_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/sun4u/excalibur/io
 
@@ -48,20 +43,15 @@ CONF_SRCDIR	= $(UTSBASE)/sun4u/excalibur/io
 #
 include $(UTSBASE)/sun4u/excalibur/Makefile.excalibur
 
-CLEANLINTFILES	= $(LINTS)
-CLEANFILES	= $(OBJECTS) $(CLEANLINTFILES)
+CLEANFILES	= $(OBJECTS)
 CLOBBERFILES	= $(OBJS_DIR)/$(MODULE) $(CLEANFILES)
 
 #
 # Define targets
 #
 ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
-#
-# lint pass one enforcement
-#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -70,11 +60,6 @@ CFLAGS += $(CCVERBOSE)
 CFLAGS += -dalign
 
 #
-# dependency
-#
-LDFLAGS += -dy
-
-#
 #	Default build targets.
 #
 .KEEP_STATE:
@@ -83,21 +68,13 @@ def:		$(DEF_DEPS)
 
 all:		$(ALL_DEPS)
 
-lint:		$(LINT_DEPS)
 
 clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:           $(LINT_DEPS)
-
-modlintlib:     $(MODLINTLIB_DEPS)
-
-clean.lint:     $(CLEAN_LINT_DEPS)
-
 install:        $(INSTALL_DEPS)
 
-LINT_LIB_DIR    = $(EXCALIBUR_LINT_LIB_DIR)
 
 #
 #	Include common targets.