12655 niagara: NULL pointer errors

Reviewed by: C Fraire <cfraire@me.com>
Approved by: Robert Mustacchi <rm@fingolfin.org>

5 files changed, 7 insertions, 51 deletions

diff --git a/usr/src/uts/sun4v/cpu/niagara_perfctr.c b/usr/src/uts/sun4v/cpu/niagara_perfctr.c
index d32191727b..9e70093f7a 100644
--- a/usr/src/uts/sun4v/cpu/niagara_perfctr.c
+++ b/usr/src/uts/sun4v/cpu/niagara_perfctr.c
@@ -598,7 +598,7 @@ ni_delete_name_kstat(ni_ksinfo_t *pp)
  */
 static kstat_t *
 ni_create_picN_kstat(char *mod_name, int pic, int pic_sel_shift,
-	int num_ev, ni_kev_mask_t *ev_array)
+    int num_ev, ni_kev_mask_t *ev_array)
 {
 	struct kstat_named *pic_named_data;
 	int	inst = 0;
@@ -608,7 +608,7 @@ ni_create_picN_kstat(char *mod_name, int pic, int pic_sel_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);
 
@@ -656,7 +656,7 @@ ni_create_picN_kstat(char *mod_name, int pic, int pic_sel_shift,
  */
 static kstat_t *
 ni_create_cntr_kstat(char *name, int instance, int (*update)(kstat_t *, int),
-	void *ksinfop)
+    void *ksinfop)
 {
 	struct kstat	*counters_ksp;
 	struct kstat_named	*counters_named_data;
diff --git a/usr/src/uts/sun4v/kt/Makefile b/usr/src/uts/sun4v/kt/Makefile
index f4721ae345..4d2d27ba15 100644
--- a/usr/src/uts/sun4v/kt/Makefile
+++ b/usr/src/uts/sun4v/kt/Makefile
@@ -37,7 +37,6 @@ UTSBASE	= ../..
 #
 MODULE		= SPARC-T3
 OBJECTS		= $(NIAGARA2CPU_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(NIAGARA2CPU_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_CPU_DIR)/$(MODULE)
 
 CPU_DIR		= .
@@ -57,13 +56,9 @@ CLEANFILES	+= $(CPULIB) $(SYM_MOD)
 #	Define targets
 #
 ALL_TARGET	= $(SYM_MOD)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= def $(BINARY) $(ROOTMODULE)
 
-#
-# lint pass one enforcement
-#
-CFLAGS += $(CCVERBOSE) -DKT_IMPL
+CFLAGS += -DKT_IMPL
 
 #
 # The ATOMIC_BO_ENABLE_SHIFT enables backoff in atomic routines.
@@ -95,12 +90,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/sun4v/niagara/Makefile b/usr/src/uts/sun4v/niagara/Makefile
index 713198a991..181c06f9d4 100644
--- a/usr/src/uts/sun4v/niagara/Makefile
+++ b/usr/src/uts/sun4v/niagara/Makefile
@@ -40,7 +40,6 @@ UTSBASE	= ../..
 #
 MODULE		= SUNW,UltraSPARC-T1
 OBJECTS		= $(NIAGARACPU_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(NIAGARACPU_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_CPU_DIR)/$(MODULE)
 
 CPU_DIR		= .
@@ -60,13 +59,9 @@ CLEANFILES	+= $(CPULIB) $(SYM_MOD)
 #	Define targets
 #
 ALL_TARGET	= $(SYM_MOD)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= def $(BINARY) $(ROOTMODULE)
 
-#
-# lint pass one enforcement
-#
-CFLAGS += $(CCVERBOSE) -DNIAGARA_IMPL
+CFLAGS += -DNIAGARA_IMPL
 CERRWARN += -_gcc=-Wno-parentheses
 
 #
@@ -88,12 +83,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/sun4v/niagara2/Makefile b/usr/src/uts/sun4v/niagara2/Makefile
index 39a01ef025..f6f4d3843e 100644
--- a/usr/src/uts/sun4v/niagara2/Makefile
+++ b/usr/src/uts/sun4v/niagara2/Makefile
@@ -39,7 +39,6 @@ UTSBASE	= ../..
 #
 MODULE		= SUNW,UltraSPARC-T2
 OBJECTS		= $(NIAGARA2CPU_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(NIAGARA2CPU_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_CPU_DIR)/$(MODULE)
 
 CPU_DIR		= .
@@ -59,13 +58,9 @@ CLEANFILES	+= $(CPULIB) $(SYM_MOD)
 #	Define targets
 #
 ALL_TARGET	= $(SYM_MOD)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= def $(BINARY) $(ROOTMODULE)
 
-#
-# lint pass one enforcement
-#
-CFLAGS += $(CCVERBOSE) -DNIAGARA2_IMPL
+CFLAGS += -DNIAGARA2_IMPL
 
 #
 # cpu-module-specific flags
@@ -97,12 +92,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/sun4v/vfalls/Makefile b/usr/src/uts/sun4v/vfalls/Makefile
index 001654791b..57494194a4 100644
--- a/usr/src/uts/sun4v/vfalls/Makefile
+++ b/usr/src/uts/sun4v/vfalls/Makefile
@@ -39,7 +39,6 @@ UTSBASE	= ../..
 #
 MODULE		= SUNW,UltraSPARC-T2+
 OBJECTS		= $(NIAGARA2CPU_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(NIAGARA2CPU_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_CPU_DIR)/$(MODULE)
 
 CPU_DIR		= .
@@ -59,13 +58,9 @@ CLEANFILES	+= $(CPULIB) $(SYM_MOD)
 #	Define targets
 #
 ALL_TARGET	= $(SYM_MOD)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= def $(BINARY) $(ROOTMODULE)
 
-#
-# lint pass one enforcement
-#
-CFLAGS += $(CCVERBOSE) -DVFALLS_IMPL
+CFLAGS += -DVFALLS_IMPL
 
 #
 # cpu-module-specific flags
@@ -97,12 +92,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS)
 
 $(CPULIB):	$(OBJECTS)