mergegcc9

3 files changed, 6 insertions, 34 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/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);
 }