Mercurial > illumos > illumos-gate
changeset 13665:d9114464c195
2603 uts should be -Waddress clean
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Reviewed by: Gordon Ross <gwr@nexenta.com>
Approved by: Robert Mustacchi <rm@joyent.com>
| author | Richard Lowe <richlowe@richlowe.net> |
|---|---|
| date | Wed, 04 Apr 2012 21:58:47 +0100 |
| parents | 739954258cbb |
| children | ab986bc53f59 |
| files | usr/src/uts/common/fs/ufs/lufs.c usr/src/uts/common/sys/ib/mgt/ibcm/ibcm_impl.h usr/src/uts/sfmmu/vm/hat_sfmmu.c usr/src/uts/sfmmu/vm/hat_sfmmu.h usr/src/uts/sun4u/lw8/io/sgenv.c usr/src/uts/sun4u/starfire/sys/idn.h |
| diffstat | 6 files changed, 27 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/common/fs/ufs/lufs.c Wed Apr 11 17:48:11 2012 -0400 +++ b/usr/src/uts/common/fs/ufs/lufs.c Wed Apr 04 21:58:47 2012 +0100 @@ -1492,7 +1492,7 @@ _init_top(); - if (&bio_lufs_strategy != NULL) + if (bio_lufs_strategy == NULL) bio_lufs_strategy = (void (*) (void *, buf_t *)) lufs_strategy; /*
--- a/usr/src/uts/common/sys/ib/mgt/ibcm/ibcm_impl.h Wed Apr 11 17:48:11 2012 -0400 +++ b/usr/src/uts/common/sys/ib/mgt/ibcm/ibcm_impl.h Wed Apr 04 21:58:47 2012 +0100 @@ -2170,15 +2170,15 @@ void ibcm_query_classport_info(ibt_channel_hdl_t channel); -#define IBCM_DUMP_RAW_MSG ibcm_dump_raw_message -#define IBCM_DUMP_SERVICE_REC ibcm_dump_srvrec -#define IBCM_DUMP_PATH_REC ibcm_dump_pathrec -#define IBCM_DUMP_NODE_REC ibcm_dump_noderec +#define IBCM_DUMP_RAW_MSG(x) ibcm_dump_raw_message(x) +#define IBCM_DUMP_SERVICE_REC(x) ibcm_dump_srvrec(x) +#define IBCM_DUMP_PATH_REC(x) ibcm_dump_pathrec(x) +#define IBCM_DUMP_NODE_REC(x) ibcm_dump_noderec(x) #else -#define IBCM_DUMP_RAW_MSG 0 && -#define IBCM_DUMP_SERVICE_REC 0 && -#define IBCM_DUMP_PATH_REC 0 && -#define IBCM_DUMP_NODE_REC 0 && +#define IBCM_DUMP_RAW_MSG(x) +#define IBCM_DUMP_SERVICE_REC(x) +#define IBCM_DUMP_PATH_REC(x) +#define IBCM_DUMP_NODE_REC(x) #endif ibt_status_t ibcm_ibmf_analyze_error(int ibmf_status);
--- a/usr/src/uts/sfmmu/vm/hat_sfmmu.c Wed Apr 11 17:48:11 2012 -0400 +++ b/usr/src/uts/sfmmu/vm/hat_sfmmu.c Wed Apr 04 21:58:47 2012 +0100 @@ -5032,7 +5032,7 @@ use_demap_range = (TTEBYTES(ttesz) == DEMAP_RANGE_PGSZ(dmrp)); if (use_demap_range) { DEMAP_RANGE_CONTINUE(dmrp, addr, endaddr); - } else { + } else if (dmrp != NULL) { DEMAP_RANGE_FLUSH(dmrp); } @@ -5389,7 +5389,7 @@ use_demap_range = (TTEBYTES(ttesz) == MMU_PAGESIZE); if (use_demap_range) { DEMAP_RANGE_CONTINUE(dmrp, addr, endaddr); - } else { + } else if (dmrp != NULL) { DEMAP_RANGE_FLUSH(dmrp); } @@ -5741,12 +5741,13 @@ * If the process is exiting, we can save a lot of fuss since * we'll flush the TLB when we free the ctx anyway. */ - if (sfmmup->sfmmu_free) + if (sfmmup->sfmmu_free) { dmrp = NULL; - else + } else { dmrp = &dmr; - - DEMAP_RANGE_INIT(sfmmup, dmrp); + DEMAP_RANGE_INIT(sfmmup, dmrp); + } + endaddr = addr + len; hblktag.htag_id = sfmmup; hblktag.htag_rid = SFMMU_INVALID_SHMERID; @@ -5919,8 +5920,8 @@ * to minimize the number of xt_sync()s that need to occur. */ if (callback != NULL && addr_count == MAX_CB_ADDR) { - DEMAP_RANGE_FLUSH(dmrp); if (dmrp != NULL) { + DEMAP_RANGE_FLUSH(dmrp); cpuset = sfmmup->sfmmu_cpusran; xt_sync(cpuset); } @@ -5960,8 +5961,8 @@ } sfmmu_hblks_list_purge(&list, 0); - DEMAP_RANGE_FLUSH(dmrp); if (dmrp != NULL) { + DEMAP_RANGE_FLUSH(dmrp); cpuset = sfmmup->sfmmu_cpusran; xt_sync(cpuset); } @@ -6054,7 +6055,7 @@ if (use_demap_range) { DEMAP_RANGE_CONTINUE(dmrp, addr, endaddr); - } else { + } else if (dmrp != NULL) { DEMAP_RANGE_FLUSH(dmrp); } ttecnt = 0;
--- a/usr/src/uts/sfmmu/vm/hat_sfmmu.h Wed Apr 11 17:48:11 2012 -0400 +++ b/usr/src/uts/sfmmu/vm/hat_sfmmu.h Wed Apr 04 21:58:47 2012 +0100 @@ -1673,12 +1673,10 @@ #define DMR_MAXBIT ((ulong_t)1<<63) /* dmr_bit high bit */ #define DEMAP_RANGE_INIT(sfmmup, dmrp) \ - if ((dmrp) != NULL) { \ (dmrp)->dmr_sfmmup = (sfmmup); \ (dmrp)->dmr_bitvec = 0; \ (dmrp)->dmr_maxbit = sfmmu_dmr_maxbit; \ - (dmrp)->dmr_pgsz = MMU_PAGESIZE; \ - } + (dmrp)->dmr_pgsz = MMU_PAGESIZE; #define DEMAP_RANGE_PGSZ(dmrp) ((dmrp)? (dmrp)->dmr_pgsz : MMU_PAGESIZE) @@ -1690,10 +1688,9 @@ } #define DEMAP_RANGE_FLUSH(dmrp) \ - if ((dmrp) != NULL) { \ - if ((dmrp)->dmr_bitvec != 0) \ - sfmmu_tlb_range_demap(dmrp); \ - } + if ((dmrp)->dmr_bitvec != 0) \ + sfmmu_tlb_range_demap(dmrp); + #define DEMAP_RANGE_MARKPG(dmrp, addr) \ if ((dmrp) != NULL) { \
--- a/usr/src/uts/sun4u/lw8/io/sgenv.c Wed Apr 11 17:48:11 2012 -0400 +++ b/usr/src/uts/sun4u/lw8/io/sgenv.c Wed Apr 04 21:58:47 2012 +0100 @@ -1708,8 +1708,6 @@ DCMN_ERR_EVENT(CE_NOTE, "%s: entered.", f); - ASSERT(board_cache != NULL); - if (first_time) { sgenv_set_valid_node_positions(node_present); first_time = FALSE;
--- a/usr/src/uts/sun4u/starfire/sys/idn.h Wed Apr 11 17:48:11 2012 -0400 +++ b/usr/src/uts/sun4u/starfire/sys/idn.h Wed Apr 04 21:58:47 2012 +0100 @@ -3429,10 +3429,10 @@ (x)[2] = (uint_t)(a2), (x)[3] = (uint_t)(a3)) #define GET_XARGS(x, a0, a1, a2, a3) \ - (((a0) ? *(uint_t *)(a0) = (x)[0] : 1), \ - ((a1) ? *(uint_t *)(a1) = (x)[1] : 1), \ - ((a2) ? *(uint_t *)(a2) = (x)[2] : 1), \ - ((a3) ? *(uint_t *)(a3) = (x)[3] : 1)) + ((*(uint_t *)(a0) = (x)[0]), \ + (*(uint_t *)(a1) = (x)[1]), \ + (*(uint_t *)(a2) = (x)[2]), \ + (*(uint_t *)(a3) = (x)[3])) #define CLR_XARGS(x) \ ((x)[0] = (x)[1] = (x)[2] = (x)[3] = 0)