diff options
Diffstat (limited to 'usr/src/uts/sun4u/opl')
26 files changed, 93 insertions, 379 deletions
diff --git a/usr/src/uts/sun4u/opl/Makefile b/usr/src/uts/sun4u/opl/Makefile index f94c5e984c..c878bb1144 100644 --- a/usr/src/uts/sun4u/opl/Makefile +++ b/usr/src/uts/sun4u/opl/Makefile @@ -44,12 +44,8 @@ install := TARGET= install install_h := TARGET= install_h clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -lintlib := TARGET= lintlib modlist := TARGET= modlist modlist := NO_STATE= -K $$MODSTATE$$$$ -modlintlib := TARGET= modlintlib -clean.lint := TARGET= clean.lint check := TARGET= check # @@ -57,14 +53,10 @@ check := TARGET= check # .KEEP_STATE: -def all clean clobber clean.lint: genassym unix .WAIT \ - $(OPL_CPU_KMODS) $(OPL_KMODS) $(CLOSED_OPL_KMODS) +def all clean clobber: genassym unix .WAIT \ + $(OPL_CPU_KMODS) $(OPL_KMODS) -modlist: unix $(OPL_CPU_KMODS) $(OPL_KMODS) $(CLOSED_OPL_KMODS) - -lintlib: unix - -modlintlib: $(OPL_KMODS) $(CLOSED_OPL_KMODS) +modlist: unix $(OPL_CPU_KMODS) $(OPL_KMODS) IMPLEMENTED_PLATFORM = SUNW,SPARC-Enterprise @@ -76,14 +68,11 @@ install: $(ROOT_OPL_DIR) $(USR_OPL_DIR) \ $(USR_OPL_LIB_DIR) \ $(OPL_CRYPTO_LINKS) \ genassym unix .WAIT $(OPL_CPU_KMODS) $(OPL_KMODS) \ - $(CLOSED_OPL_KMODS) $(OPLMSU_OPTION) + $(OPLMSU_OPTION) genassym unix $(OPL_KMODS) $(OPL_CPU_KMODS): FRC @cd $@; pwd; $(MAKE) $(TARGET) -$(CLOSED_OPL_KMODS): FRC - cd $(CLOSED)/uts/sun4u/opl/$@; pwd; $(MAKE) $(NO_STATE) $(TARGET) - $(OPL_CRYPTO_LINKS): $(ROOT_OPL_CRYPTO_DIR_64) -$(RM) $(ROOT_OPL_CRYPTO_DIR_64)/$@ $(SYMLINK) $(ROOT_US3_CRYPTO_LINK)/$@ $(ROOT_OPL_CRYPTO_DIR_64)/$@ @@ -94,27 +83,6 @@ $(OPLMSU_OPTION): FRC install_h check: FRC @cd sys; pwd; $(MAKE) $(TARGET) -lint: modlintlib - - -# -# The 'lint.platmod' target lints the opl 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/opl.c. -# - -LINT_LIBS = $(LINT_LIB) \ - -L$(OPL_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) "\nOpl Platform-dependent module: global crosschecks:" - @-$(LINT) $(LINTFLAGS) $(LINT_LIBS) 2>&1 | $(LGREP.2) - # # # Include common targets. diff --git a/usr/src/uts/sun4u/opl/Makefile.opl b/usr/src/uts/sun4u/opl/Makefile.opl index a20f97cfb1..80f356486e 100644 --- a/usr/src/uts/sun4u/opl/Makefile.opl +++ b/usr/src/uts/sun4u/opl/Makefile.opl @@ -61,7 +61,6 @@ USR_OPL_SBIN_FRUADM = $(USR_OPL_SBIN_DIR)/fruadm USR_OPL_INC_DIR = $(USR_OPL_DIR)/include USR_OPL_ISYS_DIR = $(USR_OPL_INC_DIR)/sys -OPL_LINT_LIB_DIR = $(UTSBASE)/$(PLATFORM)/opl/lint-libs/$(OBJS_DIR) OPLMSU_OPTION = options # @@ -110,12 +109,9 @@ include $(UTSBASE)/sun4u/Makefile.sun4u UNIX_DIR = $(UTSBASE)/$(PLATFORM)/opl/unix MODSTUBS_DIR = $(UNIX_DIR) DSF_DIR = $(UTSBASE)/$(PLATFORM)/opl/genassym -LINTS_DIR = $(OBJS_DIR) -LINT_LIB_DIR = $(UTSBASE)/$(PLATFORM)/opl/lint-libs/$(OBJS_DIR) UNIX_O = $(UNIX_DIR)/$(OBJS_DIR)/unix.o -LINT_LIB = $(LINT_LIB_DIR)/llib-lunix.ln # # Define the actual specific platforms @@ -152,7 +148,7 @@ MACHINE_DEFS += -DOLYMPUS_C_REV_A_ERRATA_XCALL MACHINE_DEFS += -DOLYMPUS_C_REV_B_ERRATA_XCALL # # OLYMPUS C Spurious interrupts -# - When an UE is detected in a interrupt packet, +# - When an UE is detected in a interrupt packet, # Olympus-C takes an interrupt_vector_trap (TT=0x60) while # ASI_INTR_RECIEVE.BUSY is set to zero to indicate the existence # of the error. Software will see this as a spurious interrupt since @@ -165,16 +161,4 @@ MACHINE_DEFS += -DOLYMPUS_C_REV_B_ERRATA_XCALL # recoverable. MACHINE_DEFS += -DCLEAR_INTR_BUSYBIT_ON_SPURIOUS -# -# 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_SUSPICIOUS_COMPARISON -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN -LINTTAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED -LINTTAGS += -erroff=E_STATIC_UNUSED -LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV - .KEEP_STATE: diff --git a/usr/src/uts/sun4u/opl/Makefile.rules b/usr/src/uts/sun4u/opl/Makefile.rules index 19c8381340..3c3bc09263 100644 --- a/usr/src/uts/sun4u/opl/Makefile.rules +++ b/usr/src/uts/sun4u/opl/Makefile.rules @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # This Makefile defines the build rules for the directory # uts/sun4u/opl and its children. @@ -106,33 +106,4 @@ CLEANFILES += $(DRMACH_IL) $(DRMACH_IL): $(UTSBASE)/sun4u/opl/ml/drmach.il.cpp $(IL_CPP) $(UTSBASE)/sun4u/opl/ml/drmach.il.cpp > $@ - -# -# Section 1b: Lint object build rules -# - -$(LINTS_DIR)/%.ln: $(UTSBASE)/sun4u/ngdr/io/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(LINTS_DIR)/dr_mem.ln: $(UTSBASE)/sun4u/opl/io/dr_mem.c - @($(LHEAD) $(LINT.c) $(UTSBASE)/sun4u/opl/io/dr_mem.c $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/sun4u/opl/io/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/sun4u/opl/io/pcicmu/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/sun4u/opl/ml/%.s - @($(LHEAD) $(LINT.s) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/sun4u/opl/os/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/sun4u/opl/io/oplpanel/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/sun4u/opl/io/oplmsu/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - .KEEP_STATE: diff --git a/usr/src/uts/sun4u/opl/dm2s/Makefile b/usr/src/uts/sun4u/opl/dm2s/Makefile index f97e0e7e65..4d1aa16fc0 100644 --- a/usr/src/uts/sun4u/opl/dm2s/Makefile +++ b/usr/src/uts/sun4u/opl/dm2s/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # This makefile drives the production of the dm2s driver # kernel module. @@ -41,7 +41,6 @@ UTSBASE = ../../.. MODULE = dm2s OBJECTS = $(DM2S_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(DM2S_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_OPL_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/sun4u/opl/io @@ -54,7 +53,6 @@ include $(UTSBASE)/sun4u/opl/Makefile.opl # Define targets # ALL_TARGET = $(BINARY) $(SRC_CONFFILE) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) # @@ -62,11 +60,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) # ALL_BUILDS = $(ALL_BUILDSONLY64) DEF_BUILDS = $(DEF_BUILDSONLY64) -CLEANLINTFILES += $(LINT32_FILES) -# -# lint pass one enforcement -# CFLAGS += $(CCVERBOSE) # @@ -76,7 +70,7 @@ CFLAGS += -dalign # # Dependency -LDFLAGS += -dy -Ndrv/scfd +LDFLAGS += -Ndrv/scfd # # Default build targets. @@ -91,12 +85,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/sun4u/opl/dr/Makefile b/usr/src/uts/sun4u/opl/dr/Makefile index 7589e53b9d..4e26051420 100644 --- a/usr/src/uts/sun4u/opl/dr/Makefile +++ b/usr/src/uts/sun4u/opl/dr/Makefile @@ -39,7 +39,6 @@ UTSBASE = ../../.. # MODULE = dr OBJECTS = $(DR_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(DR_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_OPL_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/sun4u/opl/io @@ -52,11 +51,12 @@ include $(UTSBASE)/sun4u/opl/Makefile.opl # Define targets # ALL_TARGET = $(BINARY) $(SRC_CONFFILE) -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 += $(CNOWARN_UNINIT) @@ -65,7 +65,7 @@ CERRWARN += -_gcc=-Wno-parentheses # # module dependencies # -LDFLAGS += -dy -Nmisc/drmach +LDFLAGS += -Nmisc/drmach # # Default build targets. @@ -80,12 +80,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/sun4u/opl/drmach/Makefile b/usr/src/uts/sun4u/opl/drmach/Makefile index a65edcc6f3..f9090bd28c 100644 --- a/usr/src/uts/sun4u/opl/drmach/Makefile +++ b/usr/src/uts/sun4u/opl/drmach/Makefile @@ -37,9 +37,8 @@ UTSBASE = ../../.. # # Define the module and object file sets. # -MODULE = drmach +MODULE = drmach OBJECTS = $(DRMACH_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(DRMACH_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_OPL_MISC_DIR)/$(MODULE) DRMACH_OFFSETS = $(UTSBASE)/sun4u/opl/ml/drmach_offsets.in @@ -54,13 +53,14 @@ include $(UTSBASE)/sun4u/opl/Makefile.opl # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) CLEANFILES += $(DRMACH_OFFSETS_H) $(DRMACH_OFFSETS_OUT) # -# 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 @@ -70,7 +70,7 @@ CERRWARN += $(CNOWARN_UNINIT) # # module dependencies # -LDFLAGS += -dy -Nmisc/opl_cfg +LDFLAGS += -Nmisc/opl_cfg # # Default build targets. @@ -85,12 +85,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) AS_INC_PATH += -I$(OBJS_DIR) diff --git a/usr/src/uts/sun4u/opl/genassym/Makefile b/usr/src/uts/sun4u/opl/genassym/Makefile index 9b0ca0c1f7..c70f484b6c 100644 --- a/usr/src/uts/sun4u/opl/genassym/Makefile +++ b/usr/src/uts/sun4u/opl/genassym/Makefile @@ -22,14 +22,12 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # This makefile drives the production of assym.h through genconst/stabs. # # sun4u opl implementation architecture dependent # -# uts/sun4u/opl/genassym/Makefile -# # # Path to the base of the uts directory tree (usually /usr/src/uts). @@ -75,8 +73,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -clean.lint: - install: def # diff --git a/usr/src/uts/sun4u/opl/io/dm2s.c b/usr/src/uts/sun4u/opl/io/dm2s.c index 92735d9981..1e6a1f9fc0 100644 --- a/usr/src/uts/sun4u/opl/io/dm2s.c +++ b/usr/src/uts/sun4u/opl/io/dm2s.c @@ -177,8 +177,8 @@ struct streamtab dm2s_streamtab = { NULL }; -DDI_DEFINE_STREAM_OPS(dm2s_ops, nulldev, nulldev, dm2s_attach, \ - dm2s_detach, nodev, dm2s_info, D_NEW | D_MP | D_MTPERMOD, \ +DDI_DEFINE_STREAM_OPS(dm2s_ops, nulldev, nulldev, dm2s_attach, + dm2s_detach, nodev, dm2s_info, D_NEW | D_MP | D_MTPERMOD, &dm2s_streamtab, ddi_quiesce_not_supported); @@ -296,7 +296,7 @@ dm2s_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) (void) sprintf(name, "%s%d", DM2S_MODNAME, instance); if (ddi_create_minor_node(dip, name, S_IFCHR, instance, - DDI_PSEUDO, NULL) == DDI_FAILURE) { + DDI_PSEUDO, 0) == DDI_FAILURE) { ddi_remove_minor_node(dip, NULL); cmn_err(CE_WARN, "Device node creation failed."); goto error; diff --git a/usr/src/uts/sun4u/opl/io/drmach.c b/usr/src/uts/sun4u/opl/io/drmach.c index 0999f18e15..651b60d8ba 100644 --- a/usr/src/uts/sun4u/opl/io/drmach.c +++ b/usr/src/uts/sun4u/opl/io/drmach.c @@ -218,14 +218,14 @@ static int drmach_node_ddi_get_prop(drmach_node_t *np, static int drmach_node_ddi_get_proplen(drmach_node_t *np, char *name, int *len); -static int drmach_get_portid(drmach_node_t *); +static int drmach_get_portid(drmach_node_t *); static sbd_error_t *drmach_i_status(drmachid_t, drmach_status_t *); static int opl_check_dr_status(); static void drmach_io_dispose(drmachid_t); static sbd_error_t *drmach_io_release(drmachid_t); static sbd_error_t *drmach_io_status(drmachid_t, drmach_status_t *); -static int drmach_init(void); -static void drmach_fini(void); +static int drmach_init(void); +static void drmach_fini(void); static void drmach_swap_pa(drmach_mem_t *, drmach_mem_t *); static drmach_board_t *drmach_get_board_by_bnum(int); @@ -457,7 +457,7 @@ struct drmach_hotcpu { drmach_board_t *bp; int bnum; int core_id; - int rv; + int rv; int option; }; @@ -652,7 +652,7 @@ drmach_setup_core_info(drmach_board_t *obj) typedef struct { drmach_node_walk_args_t *nwargs; - int (*cb)(drmach_node_walk_args_t *args); + int (*cb)(drmach_node_walk_args_t *args); int err; } drmach_node_ddi_walk_args_t; @@ -686,7 +686,7 @@ drmach_node_ddi_walk_cb(dev_info_t *dip, void *arg) static int drmach_node_ddi_walk(drmach_node_t *np, void *data, - int (*cb)(drmach_node_walk_args_t *args)) + int (*cb)(drmach_node_walk_args_t *args)) { drmach_node_walk_args_t args; drmach_node_ddi_walk_args_t nargs; @@ -735,7 +735,7 @@ drmach_node_ddi_get_parent(drmach_node_t *np, drmach_node_t *pp) static pnode_t drmach_node_ddi_get_dnode(drmach_node_t *np) { - return ((pnode_t)NULL); + return (0); } static drmach_node_t * @@ -769,7 +769,7 @@ drmach_node_ddi_get_dip(drmach_node_t *np) static int drmach_node_walk(drmach_node_t *np, void *param, - int (*cb)(drmach_node_walk_args_t *args)) + int (*cb)(drmach_node_walk_args_t *args)) { return (np->walk(np, param, cb)); } @@ -977,7 +977,7 @@ drmach_configure(drmachid_t id, int flags) static sbd_error_t * drmach_device_new(drmach_node_t *node, - drmach_board_t *bp, int portid, drmachid_t *idp) + drmach_board_t *bp, int portid, drmachid_t *idp) { int i; int rv; @@ -1541,7 +1541,7 @@ drmach_get_portid(drmach_node_t *np) static int drmach_name2type_idx(char *name) { - int index, ntypes; + int index, ntypes; if (name == NULL) return (-1); @@ -1656,7 +1656,7 @@ drmach_board_find_devices_cb(drmach_node_walk_args_t *args) sbd_error_t * drmach_board_find_devices(drmachid_t id, void *a, - sbd_error_t *(*found)(void *a, const char *, int, drmachid_t)) + sbd_error_t *(*found)(void *a, const char *, int, drmachid_t)) { drmach_board_t *bp = (drmach_board_t *)id; sbd_error_t *err; @@ -2782,7 +2782,7 @@ drmach_cpu_poweron(struct cpu *cp) int drmach_cpu_poweroff(struct cpu *cp) { - int rv = 0; + int rv = 0; processorid_t cpuid = cp->cpu_id; DRMACH_PR("drmach_cpu_poweroff: stopping cpuid %d\n", cp->cpu_id); @@ -2957,7 +2957,7 @@ opl_check_dr_status() static struct memlist * drmach_memlist_add_span(drmach_copy_rename_program_t *p, - struct memlist *mlist, uint64_t base, uint64_t len) + struct memlist *mlist, uint64_t base, uint64_t len) { struct memlist *ml, *tl, *nl; @@ -3072,7 +3072,7 @@ static int fmem_timeout = 17; /* * The empirical data on some OPL system shows that * we can copy 250 MB per second. We set it to - * 80 MB to be conservative. In normal case, + * 80 MB to be conservative. In normal case, * this timeout does not affect anything. */ @@ -3113,7 +3113,7 @@ static int drmach_copy_rename_timeout = 500; static int drmach_copy_rename_prog__relocatable(drmach_copy_rename_program_t *prog, - int cpuid) + int cpuid) { struct memlist *ml; register int rtn; @@ -3412,7 +3412,7 @@ drmach_unlock_critical(caddr_t va) sbd_error_t * drmach_copy_rename_init(drmachid_t t_id, drmachid_t s_id, - struct memlist *c_ml, drmachid_t *pgm_id) + struct memlist *c_ml, drmachid_t *pgm_id) { drmach_mem_t *s_mem; drmach_mem_t *t_mem; @@ -3690,7 +3690,7 @@ drmach_copy_rename_init(drmachid_t t_id, drmachid_t s_id, /* * max_elms - max number of memlist structures that - * may be allocated for the CPU memory list. + * may be allocated for the CPU memory list. * If there are too many memory span (because * of fragmentation) than number of memlist * available, we should return error. @@ -4042,7 +4042,7 @@ drmach_copy_rename(drmachid_t id) prog->critical->scf_reg_base = (*prog->data->scf_get_base_addr)(); if (prog->critical->scf_reg_base == (uint64_t)-1 || - prog->critical->scf_reg_base == NULL) { + prog->critical->scf_reg_base == 0) { prog->data->fmem_status.error = EOPL_FMEM_SCF_ERR; drmach_unlock_critical((caddr_t)prog); return; diff --git a/usr/src/uts/sun4u/opl/io/mc-opl.c b/usr/src/uts/sun4u/opl/io/mc-opl.c index 7d267110da..2ed14e6d22 100644 --- a/usr/src/uts/sun4u/opl/io/mc-opl.c +++ b/usr/src/uts/sun4u/opl/io/mc-opl.c @@ -607,12 +607,12 @@ mc_close(dev_t devp, int flag, int otyp, cred_t *credp) /* ARGSUSED */ static int mc_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp, - int *rvalp) + int *rvalp) { mc_flt_page_t flt_page; if (cmd == MCIOC_FAULT_PAGE) { - if (arg == NULL) + if (arg == (intptr_t)NULL) return (EINVAL); if (ddi_copyin((const void *)arg, (void *)&flt_page, @@ -1986,7 +1986,7 @@ mc_error_handler_mir(mc_opl_t *mcp, int bank, mc_rsaddr_info_t *rsaddr) } static int mc_process_error(mc_opl_t *mcp, int bank, mc_aflt_t *mc_aflt, - mc_flt_stat_t *flt_stat) + mc_flt_stat_t *flt_stat) { int ptrl_error = mc_aflt->mflt_is_ptrl; int rv = 0; @@ -2981,7 +2981,7 @@ mc_opl_get_physical_board(int sb) /* ARGSUSED */ int mc_get_mem_unum(int synd_code, uint64_t flt_addr, char *buf, int buflen, - int *lenp) + int *lenp) { int i; int j; @@ -4019,7 +4019,7 @@ mc_dump_dimm_info(board_dimm_info_t *bd_dimmp) /* ARGSUSED */ static int mc_ioctl_debug(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp, - int *rvalp) + int *rvalp) { caddr_t buf, kbuf; uint64_t pa; diff --git a/usr/src/uts/sun4u/opl/io/oplkmdrv.c b/usr/src/uts/sun4u/opl/io/oplkmdrv.c index be026a7c80..c2dfee332c 100644 --- a/usr/src/uts/sun4u/opl/io/oplkmdrv.c +++ b/usr/src/uts/sun4u/opl/io/oplkmdrv.c @@ -241,7 +241,7 @@ okm_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) */ okmsp->km_clean |= OKM_CLEAN_NODE; if (ddi_create_minor_node(dip, OKM_NODENAME, S_IFCHR, - instance, NULL, NULL) == DDI_FAILURE) { + instance, NULL, 0) == DDI_FAILURE) { cmn_err(CE_WARN, "Device node creation failed"); okm_cleanup(okmsp); return (DDI_FAILURE); diff --git a/usr/src/uts/sun4u/opl/io/oplmsu/oplmsu.c b/usr/src/uts/sun4u/opl/io/oplmsu/oplmsu.c index 4037644c39..dd1ed50fdb 100644 --- a/usr/src/uts/sun4u/opl/io/oplmsu/oplmsu.c +++ b/usr/src/uts/sun4u/opl/io/oplmsu/oplmsu.c @@ -660,7 +660,7 @@ oplmsu_close(queue_t *urq, int flag, cred_t *cred_p) cmn_err(CE_WARN, "oplmsu: close: node_flag = 0x%lx", node_flag); } - ctrl->minor = NULL; + ctrl->minor = 0; ctrl->queue = NULL; wbuf_id = ctrl->wbuf_id; wtout_id = ctrl->wtout_id; diff --git a/usr/src/uts/sun4u/opl/io/oplmsu/oplmsu_ioctl_uwp.c b/usr/src/uts/sun4u/opl/io/oplmsu/oplmsu_ioctl_uwp.c index 5fb81a1b14..2f5e51f50e 100644 --- a/usr/src/uts/sun4u/opl/io/oplmsu/oplmsu_ioctl_uwp.c +++ b/usr/src/uts/sun4u/opl/io/oplmsu/oplmsu_ioctl_uwp.c @@ -221,7 +221,7 @@ oplmsu_uwioctl_ipunlink(queue_t *uwq, mblk_t *mp) * When traditional_status isn't MSU_SETID, * the error is reported. */ - + /* FALLTHROUGH */ default : /* * When upath->status isn't MSU_PSTAT_STOP or diff --git a/usr/src/uts/sun4u/opl/io/pcicmu/pcmu_counters.c b/usr/src/uts/sun4u/opl/io/pcicmu/pcmu_counters.c index baa214a87e..edc92c1228 100644 --- a/usr/src/uts/sun4u/opl/io/pcicmu/pcmu_counters.c +++ b/usr/src/uts/sun4u/opl/io/pcicmu/pcmu_counters.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/async.h> #include <sys/sunddi.h> @@ -56,7 +54,7 @@ pcmu_create_name_kstat(char *name, pcmu_ksinfo_t *pp, pcmu_kev_mask_t *ev) for (i = 0; i < NUM_OF_PICS; i++) { pp->pic_name_ksp[i] = pcmu_create_picN_kstat(name, - i, pp->pic_shift[i], pp->pic_no_evs, ev); + i, pp->pic_shift[i], pp->pic_no_evs, ev); if (pp->pic_name_ksp[i] == NULL) { cmn_err(CE_WARN, "pci: unable to create name kstat"); @@ -85,7 +83,7 @@ pcmu_delete_name_kstat(pcmu_ksinfo_t *pp) */ static kstat_t * pcmu_create_picN_kstat(char *mod_name, int pic, int pic_shift, - int num_ev, pcmu_kev_mask_t *ev_array) + int num_ev, pcmu_kev_mask_t *ev_array) { struct kstat_named *pic_named_data; int inst = 0; @@ -95,9 +93,9 @@ pcmu_create_picN_kstat(char *mod_name, int pic, int pic_shift, (void) sprintf(pic_name, "pic%d", pic); if ((picN_ksp = kstat_create(mod_name, inst, pic_name, - "bus", KSTAT_TYPE_NAMED, num_ev, NULL)) == NULL) { + "bus", KSTAT_TYPE_NAMED, num_ev, 0)) == NULL) { cmn_err(CE_WARN, "%s %s : kstat create failed", - mod_name, pic_name); + mod_name, pic_name); /* * It is up to the calling function to delete any kstats @@ -158,7 +156,7 @@ kstat_t *pcmu_create_cntr_kstat(pcmu_t *pcmu_p, char *name, "counters", "bus", KSTAT_TYPE_NAMED, num_pics + 1, KSTAT_FLAG_WRITABLE)) == NULL) { cmn_err(CE_WARN, "%s%d counters kstat_create failed", - drv_name, drv_instance); + drv_name, drv_instance); return (NULL); } diff --git a/usr/src/uts/sun4u/opl/io/pcicmu/pcmu_util.c b/usr/src/uts/sun4u/opl/io/pcicmu/pcmu_util.c index e21639264a..af6af63644 100644 --- a/usr/src/uts/sun4u/opl/io/pcicmu/pcmu_util.c +++ b/usr/src/uts/sun4u/opl/io/pcicmu/pcmu_util.c @@ -137,7 +137,7 @@ free_pcmu_properties(pcmu_t *pcmu_p) */ int pcmu_reloc_reg(dev_info_t *dip, dev_info_t *rdip, pcmu_t *pcmu_p, - pci_regspec_t *rp) + pci_regspec_t *rp) { int assign_len, assign_entries, i; pci_regspec_t *assign_p; @@ -507,11 +507,11 @@ pcmu_cfg_report(dev_info_t *dip, ddi_fm_error_t *derr, switch (pci_err_tbl[i].reg_bit) { case PCI_STAT_R_MAST_AB: - aux_msg = "Recieved Master Abort"; - /* LINTED fallthrough on case statement */ + aux_msg = "Receieved Master Abort"; + /* FALLTHROUGH */ case PCI_STAT_R_TARG_AB: if (aux_msg != NULL) - aux_msg = "Recieved Target Abort"; + aux_msg = "Receieved Target Abort"; if (prierr) { /* * piow case are already handled in @@ -675,7 +675,7 @@ pcmu_dflag_to_str_t pcmu_dflag_strings [] = { void pcmu_debug(uint64_t flag, dev_info_t *dip, char *fmt, - uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5) + uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5) { char *s = "pcmu unknown"; uint_t cont = 0; diff --git a/usr/src/uts/sun4u/opl/mc-opl/Makefile b/usr/src/uts/sun4u/opl/mc-opl/Makefile index bafe22c32e..538b109e5c 100644 --- a/usr/src/uts/sun4u/opl/mc-opl/Makefile +++ b/usr/src/uts/sun4u/opl/mc-opl/Makefile @@ -41,7 +41,6 @@ UTSBASE = ../../.. # MODULE = mc-opl OBJECTS = $(MC_OPL_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(MC_OPL_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_OPL_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/sun4u/opl/io @@ -54,13 +53,11 @@ include $(UTSBASE)/sun4u/opl/Makefile.opl # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) -# -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) -I../sys +CFLAGS += -I../sys + +CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-parentheses CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-type-limits @@ -72,11 +69,11 @@ CERRWARN += -_gcc=-Wno-type-limits # MC_EMULATION - emulate mac patrol registers # CFLAGS += -dalign -DMC_EMULATION -#CFLAGS += -dalign +#CFLAGS += -dalign # # Dependency -LDFLAGS += -dy -Ndrv/scfd +LDFLAGS += -Ndrv/scfd # # Default build targets. @@ -91,12 +88,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/sun4u/opl/ml/drmach_asm.s b/usr/src/uts/sun4u/opl/ml/drmach_asm.s index ed2241bb1d..620d051e84 100644 --- a/usr/src/uts/sun4u/opl/ml/drmach_asm.s +++ b/usr/src/uts/sun4u/opl/ml/drmach_asm.s @@ -30,12 +30,8 @@ * only by DR for the copy-rename sequence. */ -#if defined(lint) -#include <sys/types.h> -#else #include "assym.h" #include "drmach_offsets.h" -#endif /* lint */ #include <sys/asm_linkage.h> #include <sys/param.h> @@ -51,8 +47,6 @@ #include <sys/drmach.h> #include <sys/sbd_ioctl.h> -#if !defined(lint) - /* * turn off speculative mode to prevent unwanted memory access * when we are in the FMEM loops @@ -68,15 +62,8 @@ or tmp1, tmp2, tmp1 ;\ stxa tmp1, [%g0]ASI_MCNTL ;\ membar #Sync -#endif -#if defined(lint) -/*ARGSUSED*/ -void -drmach_fmem_loop_script(caddr_t critical, int size, caddr_t stat) -{ return; } -#else /* lint */ .align 8 ENTRY_NP(drmach_fmem_loop_script) /* turn off speculative mode */ @@ -158,14 +145,7 @@ drmach_fmem_loop_script(caddr_t critical, int size, caddr_t stat) ba 2b .word 0x81b01060 SET_SIZE(drmach_fmem_loop_script) -#endif /* lint */ - -#if defined(lint) -/*ARGSUSED*/ -void -drmach_flush_icache(void) -{ return; } -#else /* lint */ + .align 8 ENTRY_NP(drmach_flush_icache) stxa %g0, [%g0]ASI_ALL_FLUSH_L1I @@ -173,14 +153,7 @@ drmach_flush_icache(void) retl nop SET_SIZE(drmach_flush_icache) -#endif - -#if defined(lint) -/*ARGSUSED*/ -int -drmach_fmem_exec_script(caddr_t critical, int size) -{ return (0); } -#else /* lint */ + .align 32 ENTRY_NP(drmach_fmem_exec_script) /* turn off speculative mode */ @@ -455,28 +428,10 @@ drmach_fmem_exec_script(caddr_t critical, int size) ba,a 1b nop SET_SIZE(drmach_fmem_exec_script) -#endif /* lint */ - -#if defined(lint) -/*ARGSUSED*/ -void -drmach_fmem_exec_script_end(caddr_t critical, int size) -{ return; } -#else /* lint */ + ENTRY_NP(drmach_fmem_exec_script_end) nop SET_SIZE(drmach_fmem_exec_script_end) -#endif /* lint */ - -#if defined(lint) -uint64_t -patch_inst(uint64_t *x, uint64_t y) -{ - *x = y; - return (0); -} - -#else /* lint */ ENTRY_NP(patch_inst) ldx [%o0], %o2 @@ -488,42 +443,18 @@ patch_inst(uint64_t *x, uint64_t y) mov %o2, %o0 SET_SIZE(patch_inst) -#endif /* lint */ - -#if defined(lint) -void -drmach_sys_trap() -{ -} -#else /* lint */ ENTRY_NP(drmach_sys_trap) mov -1, %g4 set sys_trap, %g5 jmp %g5 nop SET_SIZE(drmach_sys_trap) -#endif /* lint */ - -#if defined(lint) -uint64_t -drmach_get_stick() -{ - return (0); -} -#else /* lint */ + ENTRY_NP(drmach_get_stick) retl rd STICK, %o0 SET_SIZE(drmach_get_stick) -#endif /* lint */ - -#if defined(lint) -/*ARGSUSED*/ -void -drmach_flush(drmach_copy_rename_critical_t *x, uint_t y) -{} -#else /* lint */ ENTRY_NP(drmach_flush) mov %o0, %o2 0: @@ -534,4 +465,3 @@ drmach_flush(drmach_copy_rename_critical_t *x, uint_t y) retl nop SET_SIZE(drmach_flush) -#endif /* lint */ diff --git a/usr/src/uts/sun4u/opl/ml/mc-opl_asm.s b/usr/src/uts/sun4u/opl/ml/mc-opl_asm.s index c5610821a7..34c0f61a76 100644 --- a/usr/src/uts/sun4u/opl/ml/mc-opl_asm.s +++ b/usr/src/uts/sun4u/opl/ml/mc-opl_asm.s @@ -26,24 +26,11 @@ * All Rights Reserved, Copyright (c) FUJITSU LIMITED 2006 */ -#if defined(lint) -#include <sys/types.h> -#else #include <sys/asm_linkage.h> -#endif /* lint */ -#if defined(lint) - -/* ARGSUSED */ -void -mc_prefetch(caddr_t va) -{ return; } - -#else /* issue a strong prefetch to cause MI error */ ENTRY(mc_prefetch) prefetch [%o0],0x16 retl nop SET_SIZE(mc_prefetch) -#endif diff --git a/usr/src/uts/sun4u/opl/olympus_c/Makefile b/usr/src/uts/sun4u/opl/olympus_c/Makefile index ac3b4e8f21..33446cb083 100644 --- a/usr/src/uts/sun4u/opl/olympus_c/Makefile +++ b/usr/src/uts/sun4u/opl/olympus_c/Makefile @@ -38,7 +38,6 @@ UTSBASE = ../../.. # MODULE = FJSV,SPARC64-VI OBJECTS = $(OLYMPUS_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(OLYMPUS_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_OPL_CPU_DIR)/$(MODULE) SOFTLINKS = FJSV,SPARC64-VII ROOTSOFTLINKS = $(SOFTLINKS:%=$(ROOT_OPL_CPU_DIR)/%) @@ -60,7 +59,6 @@ CLEANFILES += $(CPULIB) $(SYM_MOD) # Define targets # ALL_TARGET = $(SYM_MOD) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = def $(BINARY) $(ROOTMODULE) $(ROOTSOFTLINKS) # @@ -68,11 +66,7 @@ INSTALL_TARGET = def $(BINARY) $(ROOTMODULE) $(ROOTSOFTLINKS) # ALL_BUILDS = $(ALL_BUILDSONLY64) DEF_BUILDS = $(DEF_BUILDSONLY64) -CLEANLINTFILES += $(LINT32_FILES) -# -# lint pass one enforcement -# OLYMPUS_C_DEFS += -DOLYMPUS_C CFLAGS += $(CCVERBOSE) $(OLYMPUS_C_DEFS) CERRWARN += $(CNOWARN_UNINIT) @@ -93,12 +87,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) $(CPULIB): $(OBJECTS) diff --git a/usr/src/uts/sun4u/opl/oplkmdrv/Makefile b/usr/src/uts/sun4u/opl/oplkmdrv/Makefile index 98a28fc104..eaf1f25b5a 100644 --- a/usr/src/uts/sun4u/opl/oplkmdrv/Makefile +++ b/usr/src/uts/sun4u/opl/oplkmdrv/Makefile @@ -41,7 +41,6 @@ INC_PATH += -I$(UTSBASE)/sun4u/opl/ MODULE = oplkmdrv OBJECTS = $(OPLKM_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(OPLKM_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_OPL_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/sun4u/opl/io @@ -54,12 +53,8 @@ include $(UTSBASE)/sun4u/opl/Makefile.opl # Define targets # ALL_TARGET = $(BINARY) $(SRC_CONFFILE) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) -# -# lint pass one enforcement -# CFLAGS += $(CCVERBOSE) # @@ -70,7 +65,7 @@ CFLAGS += -dalign # # Dependency # -LDFLAGS += -dy -Ndrv/scfd +LDFLAGS += -Ndrv/scfd # # Default build targets. @@ -85,12 +80,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/sun4u/opl/oplmsu/Makefile b/usr/src/uts/sun4u/opl/oplmsu/Makefile index e496ccdd7d..895f32ca59 100644 --- a/usr/src/uts/sun4u/opl/oplmsu/Makefile +++ b/usr/src/uts/sun4u/opl/oplmsu/Makefile @@ -40,7 +40,6 @@ UTSBASE = ../../.. # MODULE = oplmsu OBJECTS = $(OPLMSU_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(OPLMSU_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_OPL_DRV_DIR)/$(MODULE) # @@ -52,15 +51,17 @@ include $(UTSBASE)/sun4u/opl/Makefile.opl # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) +CFLAGS += -I../sys +LDFLAGS += -Ndrv/su + # -# 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) -I../sys -LDFLAGS += -dy -Ndrv/su - +CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-parentheses CERRWARN += $(CNOWARN_UNINIT) @@ -77,12 +78,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/sun4u/opl/oplpanel/Makefile b/usr/src/uts/sun4u/opl/oplpanel/Makefile index aa264cdb3b..e3417096da 100644 --- a/usr/src/uts/sun4u/opl/oplpanel/Makefile +++ b/usr/src/uts/sun4u/opl/oplpanel/Makefile @@ -39,7 +39,6 @@ UTSBASE = ../../.. # MODULE = oplpanel OBJECTS = $(OPL_PANEL_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(OPL_PANEL_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_OPL_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/sun4u/opl/io/oplpanel @@ -52,13 +51,16 @@ include $(UTSBASE)/sun4u/opl/Makefile.opl # Define targets # ALL_TARGET = $(BINARY) $(SRC_CONFFILE) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) +CFLAGS += -I../sys + # -# 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) -I../sys +CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-unused-function # @@ -74,12 +76,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/sun4u/opl/options/Makefile b/usr/src/uts/sun4u/opl/options/Makefile index 44b6f3a7b3..6960487a08 100644 --- a/usr/src/uts/sun4u/opl/options/Makefile +++ b/usr/src/uts/sun4u/opl/options/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# uts/sun4u/opl/options/Makefile + # # This makefile drives the production of the opl options conf file # @@ -51,7 +49,6 @@ include $(UTSBASE)/sun4u/opl/Makefile.opl # Define targets # ALL_TARGET = $(SRC_CONFILE) -LINT_TARGET = INSTALL_TARGET = $(ROOT_OPL_DRV_DIR) $(ROOT_CONFFILE) # @@ -72,12 +69,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/sun4u/opl/pcicmu/Makefile b/usr/src/uts/sun4u/opl/pcicmu/Makefile index fbddd90ea2..49a832b9a7 100644 --- a/usr/src/uts/sun4u/opl/pcicmu/Makefile +++ b/usr/src/uts/sun4u/opl/pcicmu/Makefile @@ -41,7 +41,6 @@ UTSBASE = ../../.. # MODULE = pcicmu OBJECTS = $(PCICMU_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(PCICMU_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_OPL_DRV_DIR)/$(MODULE) # @@ -53,11 +52,12 @@ include $(UTSBASE)/sun4u/opl/Makefile.opl # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # -# 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) -I../sys CERRWARN += -_gcc=-Wno-parentheses @@ -83,12 +83,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/sun4u/opl/platmod/Makefile b/usr/src/uts/sun4u/opl/platmod/Makefile index 92016eac00..70ddc8c915 100644 --- a/usr/src/uts/sun4u/opl/platmod/Makefile +++ b/usr/src/uts/sun4u/opl/platmod/Makefile @@ -22,15 +22,12 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # # This makefile drives the production of the sun4u opl platform # module. # # sun4u opl implementation architecture dependent # -# uts/sun4u/opl/platmod/Makefile -# # # Path to the base of the uts directory tree (usually /usr/src/uts). @@ -41,7 +38,6 @@ UTSBASE = ../../.. # MODULE = platmod OBJECTS = $(OPL_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(OPL_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_OPL_MISC_DIR)/$(MODULE) PLAT_DIR = . @@ -59,12 +55,8 @@ CLEANFILES += $(PLATLIB) # Define targets # ALL_TARGET = $(PLATLIB) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) -# -# lint pass one enforcement -# CFLAGS += $(CCVERBOSE) # @@ -80,16 +72,10 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) $(PLATLIB): $(BINARY) - $(LD) -o $(PLATLIB) -G $(BINARY) -h misc/platmod + $(LD) -o $(PLATLIB) $(GSHARED) $(BINARY) -h misc/platmod # # Include common targets. diff --git a/usr/src/uts/sun4u/opl/unix/Makefile b/usr/src/uts/sun4u/opl/unix/Makefile index e1540448c5..ea2ec40d61 100644 --- a/usr/src/uts/sun4u/opl/unix/Makefile +++ b/usr/src/uts/sun4u/opl/unix/Makefile @@ -44,11 +44,6 @@ UNIX = unix OBJECTS = $(SPECIAL_OBJS:%=$(OBJS_DIR)/%) \ $(CORE_OBJS:%=$(OBJS_DIR)/%) \ $(MACH_NOT_YET_KMODS:%=$(OBJS_DIR)/%) -LINTS = $(SPECIAL_OBJS:%.o=$(LINTS_DIR)/%.ln) \ - $(CORE_OBJS:%.o=$(LINTS_DIR)/%.ln) \ - $(MACH_NOT_YET_KMODS:%.o=$(LINTS_DIR)/%.ln) \ - $(LINTS_DIR)/vers.ln \ - $(LINTS_DIR)/modstubs.ln KRTLD_MAPFILE = $(UTSBASE)/sparc/krtld/mapfile KRTLD_OBJECTS = $(KRTLD_OBJS:%=$(OBJS_DIR)/%) @@ -82,7 +77,6 @@ include $(UTSBASE)/sun4u/opl/Makefile.opl # Define targets # ALL_TARGET = $(UNIX_BIN) -LINT_TARGET = $(LINT_LIB) INSTALL_TARGET = $(UNIX_BIN) $(ROOTMODULE) # @@ -91,7 +85,6 @@ INSTALL_TARGET = $(UNIX_BIN) $(ROOTMODULE) ALL_BUILDS = $(ALL_BUILDSONLY64) DEF_BUILDS = $(DEF_BUILDSONLY64) SYM_BUILDS = $(DEF_BUILDSONLY64) -CLEANLINTFILES += $(LINT32_FILES) # # This is UNIX_DIR. Use a short path. @@ -107,14 +100,16 @@ CLEANFILES += $(UNIX_O) $(MODSTUBS_O) $(KRTLD_O) $(KRTLD_OBJECTS) \ $(DTRACESTUBS_O) $(DTRACESTUBS) CLOBBERFILES = $(CLEANFILES) $(UNIX_BIN) -CLEANLINTFILES += $(LINT_LIB) -# -# lint pass one enforcement # Turn on doubleword alignment for 64 bit counter timer registers -# -CFLAGS += $(CCVERBOSE) -dalign +CFLAGS += -dalign +# +# 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 CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-char-subscripts @@ -140,10 +135,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) symcheck: $(SYM_DEPS) @@ -171,24 +162,7 @@ $(KRTLD_O): $(KRTLD_OBJECTS) # CPU_OBJ is defined to allow for building multiple CPU_OBJ's # $(CPULIB): $(CPU_OBJ) - $(LD) -o $@ -G -h 'cpu/$$CPU' $(CPU_OBJ) - -# -# The global lint target builds the kernel lint library (llib-lunix.ln) -# which is equivalent to a lint of /unix.o. Then all kernel modules for -# this architecture are linted against the kernel lint library. -# -# Note: lint errors in the kernel lint library will be repeated for -# each module. It is important that the kernel lint library -# be clean to keep the textual output to a reasonable level. -# - -$(LINT_LIB): $(LINT_LIB_DIR) $(LINTS) - @-$(ECHO) "\n$(UNIX): (library construction):" - @$(LINT) -o $(UNIX) $(LINTFLAGS) $(LINTS) - @$(MV) $(@F) $@ - -lintlib: $(LINT_DEPS) + $(LD) -o $@ $(GSHARED) -h 'cpu/$$CPU' $(CPU_OBJ) # # Include common targets. |