diff options
| author | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
|---|---|---|
| committer | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
| commit | 5b2acc0949194447bba6e45a0fa44d0b5f42f208 (patch) | |
| tree | 7ea9eb87bc68fee386dd39035ce715e87a0e673c /usr/src/uts/sun4u/cherrystone | |
| parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
| parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
| download | illumos-joyent-gcc9.tar.gz | |
mergegcc9
Diffstat (limited to 'usr/src/uts/sun4u/cherrystone')
| -rw-r--r-- | usr/src/uts/sun4u/cherrystone/Makefile | 24 | ||||
| -rw-r--r-- | usr/src/uts/sun4u/cherrystone/os/cherrystone.c | 7 |
2 files changed, 6 insertions, 25 deletions
diff --git a/usr/src/uts/sun4u/cherrystone/Makefile b/usr/src/uts/sun4u/cherrystone/Makefile index 415c9b4021..1fdf3597a7 100644 --- a/usr/src/uts/sun4u/cherrystone/Makefile +++ b/usr/src/uts/sun4u/cherrystone/Makefile @@ -23,8 +23,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# # This makefile drives the production of all Cherrystone system # dependent modules for the sun4u architecture. # @@ -45,12 +43,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 # @@ -58,15 +52,13 @@ check := TARGET= check # .KEEP_STATE: -def all clean.lint clean clobber modlist: $(CHERRYSTONE_KMODS) - -modlintlib: $(CHERRYSTONE_KMODS) +def all clean clobber modlist: $(CHERRYSTONE_KMODS) IMPLEMENTED_PLATFORM = SUNW,Sun-Fire-480R LINKED_PLATFORMS = SUNW,Sun-Fire-V490 -install: $(ROOT_CHERRYSTONE_DIR) $(USR_CHERRYSTONE_DIR) \ +install: $(ROOT_CHERRYSTONE_DIR) $(USR_CHERRYSTONE_DIR) \ $(USR_CHERRYSTONE_INC_DIR) \ $(USR_CHERRYSTONE_SBIN_DIR) \ $(USR_CHERRYSTONE_LIB_DIR) \ @@ -85,18 +77,6 @@ $(CHERRYSTONE_CRYPTO_LINKS): $(ROOT_CHERRYSTONE_CRYPTO_DIR_64) $(SYMLINK) $(ROOT_US3_CRYPTO_LINK)/$@ \ $(ROOT_CHERRYSTONE_CRYPTO_DIR_64)/$@ -lint: modlintlib - -LINT_LIBS = $(LINT_LIB) \ - -L$(CHERRYSTONE_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) "\nCherrystone Platform-dependent module: global crosschecks:" - @-$(LINT) $(LINTFLAGS) $(LINT_LIBS) 2>&1 | $(LGREP.2) - $(CHERRYSTONE_KMODS): FRC @cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET) diff --git a/usr/src/uts/sun4u/cherrystone/os/cherrystone.c b/usr/src/uts/sun4u/cherrystone/os/cherrystone.c index 5b24d1a3da..1baeda6b35 100644 --- a/usr/src/uts/sun4u/cherrystone/os/cherrystone.c +++ b/usr/src/uts/sun4u/cherrystone/os/cherrystone.c @@ -101,7 +101,7 @@ startup_platform(void) extern int disable_watchdog_on_exit; disable_watchdog_on_exit = 1; - mutex_init(&cherry_pcf8584_mutex, NULL, NULL, NULL); + mutex_init(&cherry_pcf8584_mutex, NULL, MUTEX_ADAPTIVE, NULL); } #pragma weak mmu_init_large_pages @@ -295,14 +295,15 @@ plat_discover_slice(pfn_t pfn, pfn_t *first, pfn_t *last) /*ARGSUSED*/ void plat_freelist_process(int mnode) -{} +{ +} /* * Called for each board/cpu/PA range detected in plat_fill_mc(). */ static void update_mem_bounds(int boardid, int cpuid, int bankid, - uint64_t base, uint64_t size) + uint64_t base, uint64_t size) { uint64_t end; int mnode; |