diff options
| author | Toomas Soome <tsoome@me.com> | 2020-01-31 09:27:42 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2020-04-27 20:26:03 +0300 |
| commit | d35ce8d71dd4f0ec672492fe393e3d5af4145a48 (patch) | |
| tree | 28fe9d7b0e9da9b4f76b75bdc4e6633041aef27a /usr/src | |
| parent | 87e3123fcf08cf5c377d6a69a15ea9f22d06d024 (diff) | |
| download | illumos-gate-d35ce8d71dd4f0ec672492fe393e3d5af4145a48.tar.gz | |
12561 rootnex: NULL pointer errors
Reviewed by: Yuri Pankov <ypankov@fastmail.com>
Reviewed by: Patrick Mooney <pmooney@pfmooney.com>
Reviewed by: Gergő Doma <domag02@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/sun4u/io/mach_rootnex.c | 4 | ||||
| -rw-r--r-- | usr/src/uts/sun4u/rootnex/Makefile | 22 | ||||
| -rw-r--r-- | usr/src/uts/sun4v/rootnex/Makefile | 22 |
3 files changed, 2 insertions, 46 deletions
diff --git a/usr/src/uts/sun4u/io/mach_rootnex.c b/usr/src/uts/sun4u/io/mach_rootnex.c index b2a7ca8f1d..1e3155bba9 100644 --- a/usr/src/uts/sun4u/io/mach_rootnex.c +++ b/usr/src/uts/sun4u/io/mach_rootnex.c @@ -105,7 +105,7 @@ rootnex_add_intr_impl(dev_info_t *dip, dev_info_t *rdip, * Hack to support the UPA slave devices before the 1275 * support for imap was introduced. */ - if (ddi_getproplen(DDI_DEV_T_ANY, dip, NULL, "interrupt-map", + if (ddi_getproplen(DDI_DEV_T_ANY, dip, 0, "interrupt-map", &len) != DDI_PROP_SUCCESS && ddi_getprop(DDI_DEV_T_ANY, rdip, DDI_PROP_DONTPASS, "upa-interrupt-slave", 0) != 0 && ddi_get_parent(rdip) == dip) { @@ -176,7 +176,7 @@ rootnex_remove_intr_impl(dev_info_t *dip, dev_info_t *rdip, * Hack to support the UPA slave devices before the 1275 * support for imap was introduced. */ - if (ddi_getproplen(DDI_DEV_T_ANY, dip, NULL, "interrupt-map", + if (ddi_getproplen(DDI_DEV_T_ANY, dip, 0, "interrupt-map", &len) != DDI_PROP_SUCCESS && ddi_getprop(DDI_DEV_T_ANY, rdip, DDI_PROP_DONTPASS, "upa-interrupt-slave", 0) != 0) { int32_t r_upaid = -1; diff --git a/usr/src/uts/sun4u/rootnex/Makefile b/usr/src/uts/sun4u/rootnex/Makefile index e1f3d0657b..6f9a01fa67 100644 --- a/usr/src/uts/sun4u/rootnex/Makefile +++ b/usr/src/uts/sun4u/rootnex/Makefile @@ -40,7 +40,6 @@ UTSBASE = ../.. # MODULE = rootnex OBJECTS = $(ROOTNEX_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(ROOTNEX_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -60,23 +59,8 @@ CLEANFILES += $(MODSTUBS_O) # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) -# -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) - -# -# 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_STATIC_UNUSED -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV - CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-unused-variable CERRWARN += -_gcc=-Wno-parentheses @@ -95,12 +79,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/sun4v/rootnex/Makefile b/usr/src/uts/sun4v/rootnex/Makefile index 004b5140c2..fc8e37b5f9 100644 --- a/usr/src/uts/sun4v/rootnex/Makefile +++ b/usr/src/uts/sun4v/rootnex/Makefile @@ -40,7 +40,6 @@ UTSBASE = ../.. # MODULE = rootnex OBJECTS = $(ROOTNEX_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(ROOTNEX_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -60,29 +59,14 @@ CLEANFILES += $(MODSTUBS_O) # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) -# -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-unused-variable CERRWARN += -_gcc=-Wno-parentheses CERRWARN += $(CNOWARN_UNINIT) # -# 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_PTRDIFF_OVERFLOW -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV -LINTTAGS += -erroff=E_STATIC_UNUSED - -# # Default build targets. # .KEEP_STATE: @@ -95,12 +79,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # |