diff options
Diffstat (limited to 'usr/src/uts/sun4v')
-rw-r--r-- | usr/src/uts/sun4v/os/intrq.c | 12 | ||||
-rw-r--r-- | usr/src/uts/sun4v/os/mach_cpu_states.c | 8 | ||||
-rw-r--r-- | usr/src/uts/sun4v/os/mach_startup.c | 8 | ||||
-rw-r--r-- | usr/src/uts/sun4v/os/mpo.c | 10 | ||||
-rw-r--r-- | usr/src/uts/sun4v/os/suspend.c | 2 | ||||
-rw-r--r-- | usr/src/uts/sun4v/rootnex/Makefile | 22 | ||||
-rw-r--r-- | usr/src/uts/sun4v/vm/mach_sfmmu.c | 2 |
7 files changed, 21 insertions, 43 deletions
diff --git a/usr/src/uts/sun4v/os/intrq.c b/usr/src/uts/sun4v/os/intrq.c index 329956b7dc..f104643e9c 100644 --- a/usr/src/uts/sun4v/os/intrq.c +++ b/usr/src/uts/sun4v/os/intrq.c @@ -195,7 +195,7 @@ cpu_intrq_cleanup(struct cpu *cpu) if (mcpup->mondo_data) { contig_mem_free(mcpup->mondo_data, INTR_REPORT_SIZE); mcpup->mondo_data = NULL; - mcpup->mondo_data_ra = NULL; + mcpup->mondo_data_ra = 0; } /* @@ -216,7 +216,7 @@ cpu_intrq_cleanup(struct cpu *cpu) if (mcpup->cpu_list) { contig_mem_free(mcpup->cpu_list, cpu_list_size); mcpup->cpu_list = NULL; - mcpup->cpu_list_ra = NULL; + mcpup->cpu_list_ra = 0; } /* @@ -226,7 +226,7 @@ cpu_intrq_cleanup(struct cpu *cpu) cpu_q_size = cpu_q_entries * INTR_REPORT_SIZE; contig_mem_free(mcpup->cpu_q_va, cpu_q_size); mcpup->cpu_q_va = NULL; - mcpup->cpu_q_base_pa = NULL; + mcpup->cpu_q_base_pa = 0; mcpup->cpu_q_size = 0; } @@ -234,7 +234,7 @@ cpu_intrq_cleanup(struct cpu *cpu) dev_q_size = dev_q_entries * INTR_REPORT_SIZE; contig_mem_free(mcpup->dev_q_va, dev_q_size); mcpup->dev_q_va = NULL; - mcpup->dev_q_base_pa = NULL; + mcpup->dev_q_base_pa = 0; mcpup->dev_q_size = 0; } @@ -242,7 +242,7 @@ cpu_intrq_cleanup(struct cpu *cpu) cpu_rq_size = cpu_rq_entries * Q_ENTRY_SIZE; contig_mem_free(mcpup->cpu_rq_va, 2 * cpu_rq_size); mcpup->cpu_rq_va = NULL; - mcpup->cpu_rq_base_pa = NULL; + mcpup->cpu_rq_base_pa = 0; mcpup->cpu_rq_size = 0; } @@ -250,7 +250,7 @@ cpu_intrq_cleanup(struct cpu *cpu) cpu_nrq_size = cpu_nrq_entries * Q_ENTRY_SIZE; contig_mem_free(mcpup->cpu_nrq_va, 2 * cpu_nrq_size); mcpup->cpu_nrq_va = NULL; - mcpup->cpu_nrq_base_pa = NULL; + mcpup->cpu_nrq_base_pa = 0; mcpup->cpu_nrq_size = 0; } } diff --git a/usr/src/uts/sun4v/os/mach_cpu_states.c b/usr/src/uts/sun4v/os/mach_cpu_states.c index f26f840967..9b72de9330 100644 --- a/usr/src/uts/sun4v/os/mach_cpu_states.c +++ b/usr/src/uts/sun4v/os/mach_cpu_states.c @@ -279,7 +279,7 @@ mdboot(int cmd, int fcn, char *bootstr, boolean_t invoke_cb) devtree_freeze(); if (invoke_cb) - (void) callb_execute_class(CB_CL_MDBOOT, NULL); + (void) callb_execute_class(CB_CL_MDBOOT, 0); /* * Clear any unresolved UEs from memory. @@ -380,7 +380,7 @@ panic_stopcpus(cpu_t *cp, kthread_t *t, int spl) (void) splzs(); CPUSET_ALL_BUT(cps, cp->cpu_id); - xt_some(cps, (xcfunc_t *)idle_stop_xcall, (uint64_t)&panic_idle, NULL); + xt_some(cps, (xcfunc_t *)idle_stop_xcall, (uint64_t)&panic_idle, 0); for (i = 0; i < NCPU; i++) { if (i != cp->cpu_id && CPU_XCALL_READY(i)) { @@ -589,8 +589,8 @@ ptl1_panic_handler(ptl1_state_t *pstate) "CPU ECC error loop", /* PTL1_BAD_ECC */ "unexpected error from hypervisor call", /* PTL1_BAD_HCALL */ "unexpected global level(%gl)", /* PTL1_BAD_GL */ - "Watchdog Reset", /* PTL1_BAD_WATCHDOG */ - "unexpected RED mode trap", /* PTL1_BAD_RED */ + "Watchdog Reset", /* PTL1_BAD_WATCHDOG */ + "unexpected RED mode trap", /* PTL1_BAD_RED */ "return value EINVAL from hcall: "\ "UNMAP_PERM_ADDR", /* PTL1_BAD_HCALL_UNMAP_PERM_EINVAL */ "return value ENOMAP from hcall: "\ diff --git a/usr/src/uts/sun4v/os/mach_startup.c b/usr/src/uts/sun4v/os/mach_startup.c index 5962239aef..983cdfbd5d 100644 --- a/usr/src/uts/sun4v/os/mach_startup.c +++ b/usr/src/uts/sun4v/os/mach_startup.c @@ -362,7 +362,7 @@ mach_htraptrace_setup(int cpuid) contig_mem_alloc_align(HTRAP_TSIZE, HTRAP_TSIZE); if (ctlp->d.hvaddr_base == NULL) { ctlp->d.hlimit = 0; - ctlp->d.hpaddr_base = NULL; + ctlp->d.hpaddr_base = 0; cmn_err(CE_WARN, "!cpu%d: failed to allocate HV " "traptrace buffer", cpuid); } else { @@ -425,7 +425,7 @@ mach_htraptrace_configure(int cpuid) if (ret != H_EOK) { ctlp->d.hvaddr_base = NULL; ctlp->d.hlimit = 0; - ctlp->d.hpaddr_base = NULL; + ctlp->d.hpaddr_base = 0; } } } else { @@ -438,7 +438,7 @@ mach_htraptrace_configure(int cpuid) htrap_tr0_inuse = 0; ctlp->d.hvaddr_base = NULL; ctlp->d.hlimit = 0; - ctlp->d.hpaddr_base = NULL; + ctlp->d.hpaddr_base = 0; } else cmn_err(CE_WARN, "!cpu%d: HV traptracing is not disabled, " @@ -468,7 +468,7 @@ mach_htraptrace_cleanup(int cpuid) } ctlp->d.hvaddr_base = NULL; ctlp->d.hlimit = 0; - ctlp->d.hpaddr_base = NULL; + ctlp->d.hpaddr_base = 0; } } diff --git a/usr/src/uts/sun4v/os/mpo.c b/usr/src/uts/sun4v/os/mpo.c index ad0cf0e78a..12b572db72 100644 --- a/usr/src/uts/sun4v/os/mpo.c +++ b/usr/src/uts/sun4v/os/mpo.c @@ -148,8 +148,8 @@ static int szc_mask0 = 0; /* Save mblocks from the MD */ #define SMALL_MBLOCKS_COUNT 8 -static struct mblock_md *mpo_mblock; -static struct mblock_md small_mpo_mblocks[SMALL_MBLOCKS_COUNT]; +static struct mblock_md *mpo_mblock; +static struct mblock_md small_mpo_mblocks[SMALL_MBLOCKS_COUNT]; static int n_mblocks = 0; /* Save mem_node stripes calculate from mblocks and lgroups. */ @@ -191,7 +191,7 @@ static void mnode_update(mpo_config_t *, pfn_t, pfn_t, update_t); /* Debug support */ #if defined(DEBUG) && !defined(lint) -#define VALIDATE_SLICE(base, end) { \ +#define VALIDATE_SLICE(base, end) { \ ASSERT(IS_P2ALIGNED(ptob(base), TTEBYTES(TTE256M))); \ ASSERT(IS_P2ALIGNED(ptob(end - base + 1), TTEBYTES(TTE256M))); \ } @@ -307,7 +307,7 @@ cpuid_to_cpunode(md_t *md, int cpuid) { mde_cookie_t rootnode, foundnode, *cpunodes; uint64_t cpuid_prop; - int n_cpunodes, i; + int n_cpunodes, i; if (md == NULL) return (MDE_INVAL_ELEM_COOKIE); @@ -1333,7 +1333,7 @@ valid_pages(md_t *md, mde_cookie_t cpu0) * to get a sane mask. */ - if (cpu0 == NULL) + if (cpu0 == 0) szc_mask = szc_mask0; else { if (md_get_prop_val(md, cpu0, "mmu-page-size-list", &szc_mask)) diff --git a/usr/src/uts/sun4v/os/suspend.c b/usr/src/uts/sun4v/os/suspend.c index e81eb001a9..2d91c6da49 100644 --- a/usr/src/uts/sun4v/os/suspend.c +++ b/usr/src/uts/sun4v/os/suspend.c @@ -669,7 +669,7 @@ suspend_start(char *error_reason, size_t max_reason_len) /* Set the {%tick,%stick}.NPT bits on all CPUs */ if (enable_user_tick_stick_emulation) { - xc_all((xcfunc_t *)enable_tick_stick_npt, NULL, NULL); + xc_all((xcfunc_t *)enable_tick_stick_npt, 0, 0); xt_sync(cpu_ready_set); ASSERT(gettick_npt() != 0); ASSERT(getstick_npt() != 0); 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) # diff --git a/usr/src/uts/sun4v/vm/mach_sfmmu.c b/usr/src/uts/sun4v/vm/mach_sfmmu.c index 398d0a069b..fcef120c0b 100644 --- a/usr/src/uts/sun4v/vm/mach_sfmmu.c +++ b/usr/src/uts/sun4v/vm/mach_sfmmu.c @@ -316,7 +316,7 @@ kdi_tlb_page_unlock(caddr_t va, int do_dtlb) void sfmmu_clear_utsbinfo() { - (void) hv_set_ctxnon0(0, NULL); + (void) hv_set_ctxnon0(0, 0); } /* |