diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/lib/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/lib/libdwarf/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/uts/common/inet/inetddi.c | 8 | ||||
| -rw-r--r-- | usr/src/uts/intel/arp/Makefile | 19 | ||||
| -rw-r--r-- | usr/src/uts/sparc/arp/Makefile | 21 |
5 files changed, 9 insertions, 44 deletions
diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile index 5e5da05650..b6697c6f61 100644 --- a/usr/src/lib/Makefile +++ b/usr/src/lib/Makefile @@ -394,7 +394,6 @@ HDRSUBDIRS= \ libdhcputil \ libdisasm \ libdiskmgt \ - libdwarf \ libdladm \ libdll \ libdlpi \ diff --git a/usr/src/lib/libdwarf/Makefile b/usr/src/lib/libdwarf/Makefile index 6b7ff6244b..e5594b685e 100644 --- a/usr/src/lib/libdwarf/Makefile +++ b/usr/src/lib/libdwarf/Makefile @@ -26,9 +26,9 @@ lint := TARGET = lint .KEEP_STATE: -all clean clobber lint install_h: $(SUBDIRS) +all clean clobber : $(SUBDIRS) -install: install_h $(SUBDIRS) +install: $(SUBDIRS) check: $(CHECKHDRS) diff --git a/usr/src/uts/common/inet/inetddi.c b/usr/src/uts/common/inet/inetddi.c index a64bf7e978..7f4f7d305d 100644 --- a/usr/src/uts/common/inet/inetddi.c +++ b/usr/src/uts/common/inet/inetddi.c @@ -127,7 +127,7 @@ static struct dev_priv { static int inet_attach(dev_info_t *devi, ddi_attach_cmd_t cmd) { - int i, ndevs; + size_t i, ndevs; if (cmd != DDI_ATTACH) return (DDI_FAILURE); @@ -141,6 +141,12 @@ inet_attach(dev_info_t *devi, ddi_attach_cmd_t cmd) break; } + /* smatch has no idea what VERIFY does. */ + if (i == ndevs) { + VERIFY(i < ndevs); + return (DDI_FAILURE); + } + return (ddi_create_priv_minor_node(devi, INET_NAME, S_IFCHR, INET_DEVMINOR, DDI_PSEUDO, netdev_privs[i].privonly, netdev_privs[i].read_priv, netdev_privs[i].write_priv, diff --git a/usr/src/uts/intel/arp/Makefile b/usr/src/uts/intel/arp/Makefile index 33a2cbb716..ad58cfda10 100644 --- a/usr/src/uts/intel/arp/Makefile +++ b/usr/src/uts/intel/arp/Makefile @@ -36,7 +36,6 @@ UTSBASE = ../.. # MODULE = arp OBJECTS = $(ARP_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(ARP_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) ROOTLINK = $(ROOT_STRMOD_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/inet/arp @@ -57,7 +56,6 @@ include $(UTSBASE)/intel/Makefile.intel # Define targets # ALL_TARGET = $(BINARY) $(SRC_CONFFILE) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOTLINK) $(ROOT_CONFFILE) # @@ -66,17 +64,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOTLINK) $(ROOT_CONFFILE) LDFLAGS += -dy -Ndrv/ip # -# 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_BAD_PTR_CAST_ALIGN -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV - -# false positive -SMOFF += index_overflow - -# # Default build targets. # .KEEP_STATE: @@ -89,12 +76,6 @@ clean: $(CLEAN_DEPS) $(SISCLEAN_DEPS) clobber: $(CLOBBER_DEPS) $(SISCLEAN_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) $(SISCHECK_DEPS) $(ROOTLINK): $(ROOT_STRMOD_DIR) $(ROOTMODULE) diff --git a/usr/src/uts/sparc/arp/Makefile b/usr/src/uts/sparc/arp/Makefile index 6d1610da66..78453cd00b 100644 --- a/usr/src/uts/sparc/arp/Makefile +++ b/usr/src/uts/sparc/arp/Makefile @@ -38,7 +38,6 @@ UTSBASE = ../.. # MODULE = arp OBJECTS = $(ARP_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(ARP_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) ROOTLINK = $(ROOT_STRMOD_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/inet/arp @@ -59,28 +58,14 @@ include $(UTSBASE)/sparc/Makefile.sparc # Define targets # ALL_TARGET = $(BINARY) $(SRC_CONFFILE) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOTLINK) $(ROOT_CONFFILE) # -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) - -# # depends on ip # LDFLAGS += -dy -Ndrv/ip # -# 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_BAD_PTR_CAST_ALIGN -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV - -# # Default build targets. # .KEEP_STATE: @@ -93,12 +78,6 @@ clean: $(CLEAN_DEPS) $(SISCLEAN_DEPS) clobber: $(CLOBBER_DEPS) $(SISCLEAN_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) $(SISCHECK_DEPS) $(ROOTLINK): $(ROOT_STRMOD_DIR) $(ROOTMODULE) |