summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2020-01-31 14:48:34 +0200
committerToomas Soome <tsoome@me.com>2020-05-10 10:37:39 +0300
commit44da0df0d621255604c6a72b29e72219d50a76d6 (patch)
tree8fa1e500eb8b1992bb7c53cda8a163c0f7e37d5d
parent0d41b2d927be6023812b1b3035b9c5cf84f700b6 (diff)
downloadillumos-joyent-44da0df0d621255604c6a72b29e72219d50a76d6.tar.gz
12627 seattle: NULL pointer errors
Reviewed by: C Fraire <cfraire@me.com> Approved by: Gordon Ross <gordon.w.ross@gmail.com>
-rw-r--r--usr/src/uts/sun4u/seattle/Makefile26
-rw-r--r--usr/src/uts/sun4u/seattle/os/seattle.c2
2 files changed, 2 insertions, 26 deletions
diff --git a/usr/src/uts/sun4u/seattle/Makefile b/usr/src/uts/sun4u/seattle/Makefile
index 5cb4516a06..e9ff071a63 100644
--- a/usr/src/uts/sun4u/seattle/Makefile
+++ b/usr/src/uts/sun4u/seattle/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: $(SEATTLE_KMODS)
-
-modlintlib: $(SEATTLE_KMODS)
+def all clean clobber modlist: $(SEATTLE_KMODS)
LINKED_PLATFORMS = SUNW,Sun-Fire-V245
@@ -78,24 +72,6 @@ install: $(ROOT_SEATTLE_DIR) \
check install_h:
-lint: modlintlib
-
-#
-# The 'lint.platmod' target lints the seattle 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/seattle.c.
-#
-LINT_LIBS = $(LINT_LIB) \
- -L$(SEATTLE_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) "\nSeattle Platform-dependent module: global crosschecks:"
- @-$(LINT) $(LINTFLAGS) $(LINT_LIBS) 2>&1 | $(LGREP.2)
-
$(SEATTLE_KMODS): FRC
@cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
diff --git a/usr/src/uts/sun4u/seattle/os/seattle.c b/usr/src/uts/sun4u/seattle/os/seattle.c
index 50eeb7ca09..80faf2faa3 100644
--- a/usr/src/uts/sun4u/seattle/os/seattle.c
+++ b/usr/src/uts/sun4u/seattle/os/seattle.c
@@ -52,7 +52,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