diff options
Diffstat (limited to 'usr/src/uts/sun4u/chicago')
-rw-r--r-- | usr/src/uts/sun4u/chicago/Makefile | 28 | ||||
-rw-r--r-- | usr/src/uts/sun4u/chicago/io/fpc/fpc-impl-4u.c | 5 | ||||
-rw-r--r-- | usr/src/uts/sun4u/chicago/os/chicago.c | 4 |
3 files changed, 3 insertions, 34 deletions
diff --git a/usr/src/uts/sun4u/chicago/Makefile b/usr/src/uts/sun4u/chicago/Makefile index 683b077445..8795f4f948 100644 --- a/usr/src/uts/sun4u/chicago/Makefile +++ b/usr/src/uts/sun4u/chicago/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # uts/sun4u/chicago/Makefile # # This makefile drives the production of the sun4u chicago platform @@ -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: $(CHICAGO_KMODS) - -modlintlib: $(CHICAGO_KMODS) +def all clean clobber modlist: $(CHICAGO_KMODS) install: $(ROOT_CHICAGO_DIR) \ $(USR_CHICAGO_DIR) \ @@ -75,24 +67,6 @@ install: $(ROOT_CHICAGO_DIR) \ check install_h: -lint: modlintlib - -# -# The 'lint.platmod' target lints the chicago 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/chicago.c. -# -LINT_LIBS = $(LINT_LIB) \ - -L$(CHICAGO_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) "\nChicago Platform-dependent module: global crosschecks:" - @-$(LINT) $(LINTFLAGS) $(LINT_LIBS) 2>&1 | $(LGREP.2) - $(CHICAGO_KMODS): FRC @cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET) diff --git a/usr/src/uts/sun4u/chicago/io/fpc/fpc-impl-4u.c b/usr/src/uts/sun4u/chicago/io/fpc/fpc-impl-4u.c index 850501397a..aa96f19079 100644 --- a/usr/src/uts/sun4u/chicago/io/fpc/fpc-impl-4u.c +++ b/usr/src/uts/sun4u/chicago/io/fpc/fpc-impl-4u.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/file.h> #include <sys/sunndi.h> #include <sys/sunddi.h> @@ -189,8 +187,7 @@ bad_regs_length: if (regs_p) kmem_free(regs_p, regs_length); bad_regs_p: - if (platform_specific_data) - kmem_free(platform_specific_data, sizeof (fire4u_specific_t)); + kmem_free(platform_specific_data, sizeof (fire4u_specific_t)); if (nodename) kmem_free(nodename, nodename_size); diff --git a/usr/src/uts/sun4u/chicago/os/chicago.c b/usr/src/uts/sun4u/chicago/os/chicago.c index f1cfc84bfe..205e940eba 100644 --- a/usr/src/uts/sun4u/chicago/os/chicago.c +++ b/usr/src/uts/sun4u/chicago/os/chicago.c @@ -23,8 +23,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> @@ -53,7 +51,7 @@ static void get_ebus_rtc_vaddr(void); void startup_platform(void) { - mutex_init(&chicago_mi2cv_mutex, NULL, NULL, NULL); + mutex_init(&chicago_mi2cv_mutex, NULL, MUTEX_ADAPTIVE, NULL); } int |