Mercurial > unleashed > wips
changeset 20600:a9ce21b31e86
10081 smatch indenting fixes for usr/src/uts
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Peter Tribble <peter.tribble@gmail.com>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Approved by: Robert Mustacchi <rm@joyent.com>
line wrap: on
line diff
--- a/usr/src/uts/common/c2/audit_event.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/c2/audit_event.c Mon Jan 14 19:42:58 2019 +0000 @@ -22,6 +22,7 @@ /* * Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011 Bayard G. Bell. All rights reserved. + * Copyright (c) 2018, Joyent, Inc. */ /* @@ -2340,9 +2341,9 @@ au_uwrite(au_to_arg32(1, "fd", fd)); au_uwrite(au_to_arg32(2, "cmd", cmd)); #ifndef _LP64 - au_uwrite(au_to_arg32(3, "arg", (uint32_t)cmarg)); + au_uwrite(au_to_arg32(3, "arg", (uint32_t)cmarg)); #else - au_uwrite(au_to_arg64(3, "arg", (uint64_t)cmarg)); + au_uwrite(au_to_arg64(3, "arg", (uint64_t)cmarg)); #endif return; } @@ -2363,9 +2364,9 @@ au_uwrite(au_to_arg32(2, "cmd", cmd)); #ifndef _LP64 - au_uwrite(au_to_arg32(3, "arg", (uint32_t)cmarg)); + au_uwrite(au_to_arg32(3, "arg", (uint32_t)cmarg)); #else - au_uwrite(au_to_arg64(3, "arg", (uint64_t)cmarg)); + au_uwrite(au_to_arg64(3, "arg", (uint64_t)cmarg)); #endif }
--- a/usr/src/uts/common/fs/nfs/nfs_dlinet.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/fs/nfs/nfs_dlinet.c Mon Jan 14 19:42:58 2019 +0000 @@ -23,6 +23,10 @@ * Use is subject to license terms. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ + #include <sys/param.h> #include <sys/types.h> #include <sys/systm.h> @@ -1143,7 +1147,7 @@ "dhcp: couldn't add route " "to %s: %m.\n", inet_ntoa(defr)); - continue; + continue; } if (dldebug) { printf("dhcp: added route %s\n",
--- a/usr/src/uts/common/fs/portfs/port_fop.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/fs/portfs/port_fop.c Mon Jan 14 19:42:58 2019 +0000 @@ -24,7 +24,7 @@ */ /* - * Copyright (c) 2013, Joyent, Inc. All rights reserved. + * Copyright (c) 2018, Joyent, Inc. */ /* @@ -2029,7 +2029,7 @@ * the hash list. */ for (pvfsp = *ppvfsp; pvfsp->pvfs != vfsp; pvfsp = pvfsp->pvfs_next) - ; + ; /* * For some of the filesystems, allow unmounts to proceed only if @@ -2079,7 +2079,7 @@ mutex_enter(mtx); for (; *ppvfsp && (*ppvfsp)->pvfs != vfsp; ppvfsp = &(*ppvfsp)->pvfs_next) - ; + ; /* * remove and free it.
--- a/usr/src/uts/common/inet/ip/ip_mroute.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/inet/ip/ip_mroute.c Mon Jan 14 19:42:58 2019 +0000 @@ -24,6 +24,10 @@ /* Copyright (c) 1990 Mentat Inc. */ /* + * Copyright (c) 2018, Joyent, Inc. + */ + +/* * Procedures for the kernel part of DVMRP, * a Distance-Vector Multicast Routing Protocol. * (See RFC-1075) @@ -720,7 +724,7 @@ mutex_exit(&mfc_rt->mfc_mutex); (void) untimeout( mfc_rt->mfc_timeout_id); - mfc_rt->mfc_timeout_id = 0; + mfc_rt->mfc_timeout_id = 0; mutex_enter(&mfc_rt->mfc_mutex); /*
--- a/usr/src/uts/common/inet/ip/ip_ndp.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/inet/ip/ip_ndp.c Mon Jan 14 19:42:58 2019 +0000 @@ -22,6 +22,10 @@ * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ + #include <sys/types.h> #include <sys/stream.h> #include <sys/stropts.h> @@ -4955,7 +4959,7 @@ frac = 2; /* Set intv randomly in the range [intv-frac .. intv+frac] */ if ((intv = intv - frac + rnd % (2 * frac + 1)) <= 0) - intv = 1; + intv = 1; } return (intv); }
--- a/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_chan.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_chan.c Mon Jan 14 19:42:58 2019 +0000 @@ -24,6 +24,10 @@ */ /* + * Copyright (c) 2018, Joyent, Inc. + */ + +/* * routines common to isoch receive and isoch transmit */ #include <sys/stat.h> @@ -614,10 +618,11 @@ nsegs = (cnt / fps) + 1; - seg = idx / fps; - for (;;) { - (void) ddi_dma_sync(pool->ip_seg[seg].is_dma_hdl, 0, - icp->ic_framesz, type); + seg = idx / fps; + + for (;;) { + (void) ddi_dma_sync(pool->ip_seg[seg].is_dma_hdl, 0, + icp->ic_framesz, type); --nsegs; if (nsegs == 0)
--- a/usr/src/uts/common/io/1394/targets/dcam1394/dcam.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/1394/targets/dcam1394/dcam.c Mon Jan 14 19:42:58 2019 +0000 @@ -21,7 +21,7 @@ /* * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * Copyright 2017 Joyent, Inc. + * Copyright (c) 2018, Joyent, Inc. */ @@ -193,7 +193,7 @@ } #ifndef NPROBE - (void) tnf_mod_unload(&modlinkage); + (void) tnf_mod_unload(&modlinkage); #endif /* ! NPROBE */ ddi_soft_state_fini(&dcam_state_p);
--- a/usr/src/uts/common/io/aac/aac.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/aac/aac.c Mon Jan 14 19:42:58 2019 +0000 @@ -3,6 +3,7 @@ */ /* + * Copyright (c) 2018, Joyent, Inc. * Copyright 2005-08 Adaptec, Inc. * Copyright (c) 2005-08 Adaptec Inc., Achim Leubner * Copyright (c) 2000 Michael Smith @@ -7312,7 +7313,7 @@ if (bp == NULL) { if ((bp = scsi_alloc_consistent_buf(&ap, NULL, buf_len, B_READ, NULL_FUNC, NULL)) == NULL) - return (AACERR); + return (AACERR); } if ((pkt = scsi_init_pkt(&ap, NULL, bp, CDB_GROUP5, sizeof (struct scsi_arq_status), 0, PKT_CONSISTENT,
--- a/usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/clc.h Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/clc.h Mon Jan 14 19:42:58 2019 +0000 @@ -82,10 +82,6 @@ #define ELINK_EVENT_ID_SFP_UNQUALIFIED_MODULE 1 #define ELINK_EVENT_ID_SFP_POWER_FAULT 2 -#ifdef ELINK_AUX_POWER -#define elink_cb_event_log(cb, level, ...) -#define elink_cb_get_friendly_name(cb) '' -#endif /*ELINK_AUX_POWER */ #ifndef ARRAY_SIZE #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) #endif
--- a/usr/src/uts/common/io/cryptmod.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/cryptmod.c Mon Jan 14 19:42:58 2019 +0000 @@ -2,6 +2,8 @@ * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * + * Copyright (c) 2018, Joyent, Inc. + * * STREAMS Crypto Module * * This module is used to facilitate Kerberos encryption @@ -3003,7 +3005,7 @@ if (cbp == NULL) { cmn_err(CE_WARN, "allocb (%d bytes) failed", sz); - return (NULL); + return (NULL); } cbp->b_cont = mp->b_cont;
--- a/usr/src/uts/common/io/dld/dld_proto.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/dld/dld_proto.c Mon Jan 14 19:42:58 2019 +0000 @@ -21,7 +21,7 @@ /* * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2012, Nexenta Systems, Inc. All rights reserved. - * Copyright 2017 Joyent, Inc. + * Copyright (c) 2018, Joyent, Inc. */ /* @@ -817,7 +817,7 @@ mac_perim_exit(mph); if (err != 0) { - switch (err) { + switch (err) { case EINVAL: dl_err = DL_BADADDR; err = 0;
--- a/usr/src/uts/common/io/fd.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/fd.c Mon Jan 14 19:42:58 2019 +0000 @@ -23,6 +23,9 @@ * Use is subject to license terms. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ /* * Floppy Disk driver @@ -1769,7 +1772,7 @@ if (rval != 0) break; - if (fc.fdc_cmd == FDCMD_READ || fc.fdc_cmd == FDCMD_WRITE) { + if (fc.fdc_cmd == FDCMD_READ || fc.fdc_cmd == FDCMD_WRITE) { auto struct iovec aiov; auto struct uio auio; struct uio *uio = &auio;
--- a/usr/src/uts/common/io/fibre-channel/fca/oce/oce_gld.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/fibre-channel/fca/oce/oce_gld.c Mon Jan 14 19:42:58 2019 +0000 @@ -22,6 +22,10 @@ /* Copyright © 2003-2011 Emulex. All rights reserved. */ /* + * Copyright (c) 2018, Joyent, Inc. + */ + +/* * Source file containing the implementation of the driver entry points * and related helper functions */ @@ -210,7 +214,7 @@ ret = oce_set_multicast_table(dev, dev->if_id, &mca_hw_list[0], new_mcnt, B_FALSE); } - if (ret != 0) { + if (ret != 0) { oce_log(dev, CE_WARN, MOD_CONFIG, "mcast %s fails", add ? "ADD" : "DEL"); DEV_UNLOCK(dev);
--- a/usr/src/uts/common/io/fibre-channel/fca/oce/oce_mbx.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/fibre-channel/fca/oce/oce_mbx.c Mon Jan 14 19:42:58 2019 +0000 @@ -21,6 +21,9 @@ /* Copyright © 2003-2011 Emulex. All rights reserved. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ /* * Source file containing the implementation of MBOX @@ -156,7 +159,7 @@ if (mbox_db.bits.ready) { return (0); } - drv_usecwait(5); + drv_usecwait(5); } return (ETIMEDOUT);
--- a/usr/src/uts/common/io/fibre-channel/fca/qlge/qlge.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/fibre-channel/fca/qlge/qlge.c Mon Jan 14 19:42:58 2019 +0000 @@ -23,6 +23,10 @@ * Copyright 2010 QLogic Corporation. All rights reserved. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ + #include <qlge.h> #include <sys/atomic.h> #include <sys/strsubr.h> @@ -2400,7 +2404,7 @@ /* Not TCP or UDP packet? nothing more to do */ if (((net_rsp->flags2 & IB_MAC_IOCB_RSP_T) == 0) && ((net_rsp->flags2 & IB_MAC_IOCB_RSP_U) == 0)) - return; + return; /* No CKO support for IPv6 */ if ((net_rsp->flags3 & IB_MAC_IOCB_RSP_V6) != 0)
--- a/usr/src/uts/common/io/ib/clients/rds/rdsddi.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/ib/clients/rds/rdsddi.c Mon Jan 14 19:42:58 2019 +0000 @@ -23,6 +23,10 @@ * Use is subject to license terms. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ + #include <sys/types.h> #include <sys/conf.h> #include <sys/modctl.h> @@ -839,7 +843,7 @@ /* Detect valid T_UNITDATA_REQ here */ if (((union T_primitives *)(uintptr_t)rptr)->type == T_UNITDATA_REQ) - break; + break; } /* FALLTHRU */ default:
--- a/usr/src/uts/common/io/ib/ibnex/ibnex.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/ib/ibnex/ibnex.c Mon Jan 14 19:42:58 2019 +0000 @@ -23,6 +23,10 @@ */ /* + * Copyright (c) 2018, Joyent, Inc. + */ + +/* * The InfiniBand Nexus driver (IB nexus) is a bus nexus driver for IB bus. * It supports Port nodes, Virtual Physical Point of Attachment nodes (VPPA) * for HCAs registered with IBTL and IOC nodes for all the IOCs present in @@ -2863,7 +2867,7 @@ IBTF_DPRINTF_L2("ibnex", "\tcomm_svc_init : " "Service name %s invalid : Not unique", servicep[count]); - continue; + continue; } valid[count] = 1;
--- a/usr/src/uts/common/io/iwp/iwp.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/iwp/iwp.c Mon Jan 14 19:42:58 2019 +0000 @@ -1,3 +1,7 @@ +/* + * Copyright (c) 2018, Joyent, Inc. + */ + /* * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. @@ -3832,21 +3836,21 @@ IEEE80211_ADDR_COPY(sc->sc_config.bssid, in->in_bssid); sc->sc_config.chan = LE_16(ieee80211_chan2ieee(ic, in->in_chan)); - sc->sc_config.ofdm_ht_triple_stream_basic_rates = 0; - sc->sc_config.ofdm_ht_dual_stream_basic_rates = 0; - sc->sc_config.ofdm_ht_single_stream_basic_rates = 0; - - if (IEEE80211_MODE_11B == ic->ic_curmode) { - sc->sc_config.cck_basic_rates = 0x03; - sc->sc_config.ofdm_basic_rates = 0; - } else if ((in->in_chan != IEEE80211_CHAN_ANYC) && - (IEEE80211_IS_CHAN_5GHZ(in->in_chan))) { - sc->sc_config.cck_basic_rates = 0; - sc->sc_config.ofdm_basic_rates = 0x15; - } else { /* assume 802.11b/g */ - sc->sc_config.cck_basic_rates = 0x0f; - sc->sc_config.ofdm_basic_rates = 0xff; - } + sc->sc_config.ofdm_ht_triple_stream_basic_rates = 0; + sc->sc_config.ofdm_ht_dual_stream_basic_rates = 0; + sc->sc_config.ofdm_ht_single_stream_basic_rates = 0; + + if (IEEE80211_MODE_11B == ic->ic_curmode) { + sc->sc_config.cck_basic_rates = 0x03; + sc->sc_config.ofdm_basic_rates = 0; + } else if ((in->in_chan != IEEE80211_CHAN_ANYC) && + (IEEE80211_IS_CHAN_5GHZ(in->in_chan))) { + sc->sc_config.cck_basic_rates = 0; + sc->sc_config.ofdm_basic_rates = 0x15; + } else { /* assume 802.11b/g */ + sc->sc_config.cck_basic_rates = 0x0f; + sc->sc_config.ofdm_basic_rates = 0xff; + } sc->sc_config.flags &= ~LE_32(RXON_FLG_SHORT_PREAMBLE_MSK | RXON_FLG_SHORT_SLOT_MSK);
--- a/usr/src/uts/common/io/nge/nge_chip.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/nge/nge_chip.c Mon Jan 14 19:42:58 2019 +0000 @@ -24,6 +24,10 @@ * Use is subject to license terms. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ + #include "nge.h" static uint32_t nge_watchdog_count = 1 << 5; static uint32_t nge_watchdog_check = 1 << 3; @@ -1010,25 +1014,25 @@ mac = uaddr1.addr_bits.addr; mac <<= 32; mac |= nge_reg_get32(ngep, NGE_UNI_ADDR0); - ngep->chipinfo.hw_mac_addr = mac; - if (ngep->dev_spec_param.mac_addr_order) { - for (i = 0; i < ETHERADDRL; i++) { - ngep->chipinfo.vendor_addr.addr[i] = - (uchar_t)mac; - ngep->cur_uni_addr.addr[i] = - (uchar_t)mac; - mac >>= 8; - } - } else { - for (i = ETHERADDRL; i-- != 0; ) { - ngep->chipinfo.vendor_addr.addr[i] = - (uchar_t)mac; - ngep->cur_uni_addr.addr[i] = - (uchar_t)mac; - mac >>= 8; - } + ngep->chipinfo.hw_mac_addr = mac; + if (ngep->dev_spec_param.mac_addr_order) { + for (i = 0; i < ETHERADDRL; i++) { + ngep->chipinfo.vendor_addr.addr[i] = + (uchar_t)mac; + ngep->cur_uni_addr.addr[i] = + (uchar_t)mac; + mac >>= 8; } - ngep->chipinfo.vendor_addr.set = 1; + } else { + for (i = ETHERADDRL; i-- != 0; ) { + ngep->chipinfo.vendor_addr.addr[i] = + (uchar_t)mac; + ngep->cur_uni_addr.addr[i] = + (uchar_t)mac; + mac >>= 8; + } + } + ngep->chipinfo.vendor_addr.set = 1; } pci_config_put8(ngep->cfg_handle, PCI_CONF_CACHE_LINESZ, ngep->chipinfo.clsize);
--- a/usr/src/uts/common/io/ntxn/unm_gem.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/ntxn/unm_gem.c Mon Jan 14 19:42:58 2019 +0000 @@ -26,6 +26,11 @@ * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ + +/* + * Copyright (c) 2018, Joyent, Inc. + */ + #include <sys/types.h> #include <sys/conf.h> #include <sys/debug.h> @@ -1355,7 +1360,7 @@ unm_adapter *adapter = (unm_adapter *)ddi_get_driver_private(dip); if (adapter == NULL) - return (DDI_FAILURE); + return (DDI_FAILURE); switch (cmd) { case DDI_DETACH:
--- a/usr/src/uts/common/io/ntxn/unm_nic_hw.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/ntxn/unm_nic_hw.c Mon Jan 14 19:42:58 2019 +0000 @@ -24,6 +24,10 @@ * Use is subject to license terms. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ + #include <sys/types.h> #include <sys/conf.h> #include <sys/debug.h> @@ -1859,10 +1863,10 @@ break; } -if (!ret) - adapter->promisc = 1; + if (!ret) + adapter->promisc = 1; - return (ret); + return (ret); } int
--- a/usr/src/uts/common/io/ntxn/unm_nic_init.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/ntxn/unm_nic_init.c Mon Jan 14 19:42:58 2019 +0000 @@ -24,6 +24,10 @@ * Use is subject to license terms. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ + #include <sys/types.h> #include <sys/conf.h> #include <sys/debug.h> @@ -67,56 +71,56 @@ static void crb_addr_transform_setup(void) { - crb_addr_transform(XDMA); - crb_addr_transform(TIMR); - crb_addr_transform(SRE); - crb_addr_transform(SQN3); - crb_addr_transform(SQN2); - crb_addr_transform(SQN1); - crb_addr_transform(SQN0); - crb_addr_transform(SQS3); - crb_addr_transform(SQS2); - crb_addr_transform(SQS1); - crb_addr_transform(SQS0); - crb_addr_transform(RPMX7); - crb_addr_transform(RPMX6); - crb_addr_transform(RPMX5); - crb_addr_transform(RPMX4); - crb_addr_transform(RPMX3); - crb_addr_transform(RPMX2); - crb_addr_transform(RPMX1); - crb_addr_transform(RPMX0); - crb_addr_transform(ROMUSB); - crb_addr_transform(SN); - crb_addr_transform(QMN); - crb_addr_transform(QMS); - crb_addr_transform(PGNI); - crb_addr_transform(PGND); - crb_addr_transform(PGN3); - crb_addr_transform(PGN2); - crb_addr_transform(PGN1); - crb_addr_transform(PGN0); - crb_addr_transform(PGSI); - crb_addr_transform(PGSD); - crb_addr_transform(PGS3); - crb_addr_transform(PGS2); - crb_addr_transform(PGS1); - crb_addr_transform(PGS0); - crb_addr_transform(PS); - crb_addr_transform(PH); - crb_addr_transform(NIU); - crb_addr_transform(I2Q); - crb_addr_transform(EG); - crb_addr_transform(MN); - crb_addr_transform(MS); - crb_addr_transform(CAS2); - crb_addr_transform(CAS1); - crb_addr_transform(CAS0); - crb_addr_transform(CAM); - crb_addr_transform(C2C1); - crb_addr_transform(C2C0); - crb_addr_transform(SMB); - crb_addr_transform(OCM0); + crb_addr_transform(XDMA); + crb_addr_transform(TIMR); + crb_addr_transform(SRE); + crb_addr_transform(SQN3); + crb_addr_transform(SQN2); + crb_addr_transform(SQN1); + crb_addr_transform(SQN0); + crb_addr_transform(SQS3); + crb_addr_transform(SQS2); + crb_addr_transform(SQS1); + crb_addr_transform(SQS0); + crb_addr_transform(RPMX7); + crb_addr_transform(RPMX6); + crb_addr_transform(RPMX5); + crb_addr_transform(RPMX4); + crb_addr_transform(RPMX3); + crb_addr_transform(RPMX2); + crb_addr_transform(RPMX1); + crb_addr_transform(RPMX0); + crb_addr_transform(ROMUSB); + crb_addr_transform(SN); + crb_addr_transform(QMN); + crb_addr_transform(QMS); + crb_addr_transform(PGNI); + crb_addr_transform(PGND); + crb_addr_transform(PGN3); + crb_addr_transform(PGN2); + crb_addr_transform(PGN1); + crb_addr_transform(PGN0); + crb_addr_transform(PGSI); + crb_addr_transform(PGSD); + crb_addr_transform(PGS3); + crb_addr_transform(PGS2); + crb_addr_transform(PGS1); + crb_addr_transform(PGS0); + crb_addr_transform(PS); + crb_addr_transform(PH); + crb_addr_transform(NIU); + crb_addr_transform(I2Q); + crb_addr_transform(EG); + crb_addr_transform(MN); + crb_addr_transform(MS); + crb_addr_transform(CAS2); + crb_addr_transform(CAS1); + crb_addr_transform(CAS0); + crb_addr_transform(CAM); + crb_addr_transform(C2C1); + crb_addr_transform(C2C0); + crb_addr_transform(SMB); + crb_addr_transform(OCM0); /* * Used only in P3 just define it for P2 also.
--- a/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c Mon Jan 14 19:42:58 2019 +0000 @@ -22,7 +22,7 @@ /* * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2016 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2017, Joyent, Inc. + * Copyright (c) 2018, Joyent, Inc. * Copyright 2014 OmniTI Computer Consulting, Inc. All rights reserved. * Copyright (c) 2014, Tegile Systems Inc. All rights reserved. */ @@ -11958,7 +11958,7 @@ mptsas_log(mpt, CE_WARN, "Check of DMA handle failed in " "mptsas_diag_register."); ddi_fm_service_impact(mpt->m_dip, DDI_SERVICE_UNAFFECTED); - status = DDI_FAILURE; + status = DDI_FAILURE; } /*
--- a/usr/src/uts/common/io/skd/skd.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/skd/skd.c Mon Jan 14 19:42:58 2019 +0000 @@ -23,6 +23,7 @@ /* * Copyright 2013 STEC, Inc. All rights reserved. * Copyright 2015 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2018, Joyent, Inc. */ #include <sys/types.h> @@ -4775,8 +4776,8 @@ } progress |= SKD_REGS_MAPPED; - skdev->iomap_iobase = skdev->iobase; - skdev->iomap_handle = skdev->iobase_handle; + skdev->iomap_iobase = skdev->iobase; + skdev->iomap_handle = skdev->iobase_handle; Dcmn_err(CE_NOTE, "%s: PCI iobase=%ph, iomap=%ph, regnum=%d, " "regsize=%ld", skdev->name, (void *)skdev->iobase,
--- a/usr/src/uts/common/io/tl.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/tl.c Mon Jan 14 19:42:58 2019 +0000 @@ -25,7 +25,7 @@ /* * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. - * Copyright 2015 Joyent, Inc. + * Copyright (c) 2018, Joyent, Inc. */ /* @@ -2978,7 +2978,7 @@ */ (void) (STRLOG(TL_ID, tep->te_minor, 2, SL_TRACE, "tl_conn_req: qlen overflow connection refused")); - err = ECONNREFUSED; + err = ECONNREFUSED; } /*
--- a/usr/src/uts/common/io/urtw/urtw.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/urtw/urtw.c Mon Jan 14 19:42:58 2019 +0000 @@ -1,3 +1,7 @@ +/* + * Copyright (c) 2018, Joyent, Inc. + */ + /* * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. @@ -190,7 +194,7 @@ uint16_t tproduct = tbl[nentries].dev.p; if (tbl[nentries].dev.v == vendor && (tproduct == product || tproduct == USB_PRODUCT_ANY)) - return (&tbl[nentries]); + return (&tbl[nentries]); } return (NULL); }
--- a/usr/src/uts/common/io/usb/clients/hidparser/hidparser.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/usb/clients/hidparser/hidparser.c Mon Jan 14 19:42:58 2019 +0000 @@ -23,6 +23,9 @@ * Use is subject to license terms. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ #include <sys/usb/usba/usbai_version.h> #include <sys/usb/usba.h> @@ -1642,11 +1645,11 @@ curr_ei->prev_coll = cache_ei; cache_ei = curr_ei; - USB_DPRINTF_L3(PRINT_MASK_ALL, - hparser_log_handle, - "Start Collection:cache_ei = 0x%p," - " curr_ei = 0x%p", - (void *)cache_ei, (void *)curr_ei); + USB_DPRINTF_L3(PRINT_MASK_ALL, + hparser_log_handle, + "Start Collection:cache_ei = 0x%p," + " curr_ei = 0x%p", + (void *)cache_ei, (void *)curr_ei); if (prev_ei == NULL) { prev_ei = curr_ei;
--- a/usr/src/uts/common/io/usb/clients/usbinput/usbwcm/usbwcm.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/usb/clients/usbinput/usbwcm/usbwcm.c Mon Jan 14 19:42:58 2019 +0000 @@ -1,3 +1,7 @@ +/* + * Copyright (c) 2018, Joyent, Inc. + */ + /* * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. @@ -510,7 +514,7 @@ case 0x1: /* Outbound tracking is unreliable on the Cintiq */ if (sc->sc_type->protocol == CINTIQ) - break; + break; /* Tool motion */ /*FALLTHRU*/
--- a/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c Mon Jan 14 19:42:58 2019 +0000 @@ -22,6 +22,9 @@ * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ /* * USB video class driver (usbvc(7D)) @@ -1337,8 +1340,8 @@ case USB_DEV_ONLINE: /* Deny the powerdown request if the device is busy */ if (usbvcp->usbvc_pm->usbvc_pm_busy != 0) { - USB_DPRINTF_L2(PRINT_MASK_PM, usbvcp->usbvc_log_handle, - "usbvc_pwrlvl0: usbvc_pm_busy"); + USB_DPRINTF_L2(PRINT_MASK_PM, usbvcp->usbvc_log_handle, + "usbvc_pwrlvl0: usbvc_pm_busy"); return (USB_FAILURE); }
--- a/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c Mon Jan 14 19:42:58 2019 +0000 @@ -450,7 +450,7 @@ USB_DPRINTF_L2(PRINT_MASK_ATTA, ehcip->ehci_log_hdl, "ehci_allocate_pools: More than 1 cookie"); - goto failure; + goto failure; } } else { USB_DPRINTF_L4(PRINT_MASK_ATTA, ehcip->ehci_log_hdl,
--- a/usr/src/uts/common/io/usb/hcd/openhci/ohci_polled.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/usb/hcd/openhci/ohci_polled.c Mon Jan 14 19:42:58 2019 +0000 @@ -22,6 +22,7 @@ * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * Copyright (c) 2016 by Delphix. All rights reserved. + * Copyright (c) 2018, Joyent, Inc. */ /* @@ -1351,7 +1352,8 @@ while (td) { - next_td = ohci_td_iommu_to_cpu(ohcip, Get_TD(td->hctd_next_td)); + next_td = ohci_td_iommu_to_cpu(ohcip, + Get_TD(td->hctd_next_td)); /* * Insert valid interrupt TD back into ED's
--- a/usr/src/uts/common/io/usb/usba/hubdi.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/usb/usba/hubdi.c Mon Jan 14 19:42:58 2019 +0000 @@ -22,7 +22,7 @@ * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2012 Garrett D'Amore <garrett@damore.org>. All rights reserved. * Copyright 2014 Nexenta Systems, Inc. All rights reserved. - * Copyright 2016 Joyent, Inc. + * Copyright (c) 2018, Joyent, Inc. */ /* @@ -6799,7 +6799,7 @@ if (hubd->h_children_dips[port] == child_dip) { usba_device_t *ud = hubd->h_usba_devices[port]; - hubd->h_children_dips[port] = NULL; + hubd->h_children_dips[port] = NULL; if (ud) { mutex_exit(HUBD_MUTEX(hubd));
--- a/usr/src/uts/common/io/vr/vr.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/io/vr/vr.c Mon Jan 14 19:42:58 2019 +0000 @@ -24,6 +24,10 @@ * Use is subject to license terms. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ + #include <sys/types.h> #include <sys/stream.h> #include <sys/strsun.h> @@ -1700,7 +1704,7 @@ vrp->reset = 1; vr_log(vrp, CE_WARN, "TX stalled, resetting MAC"); - vrp->stats.txstalls++; + vrp->stats.txstalls++; } else { /* * Increase until we find that we've @@ -3390,9 +3394,9 @@ default: return; - } - - mac_prop_info_set_default_uint8(prh, val); + } + + mac_prop_info_set_default_uint8(prh, val); } /*
--- a/usr/src/uts/common/krtld/kobj.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/krtld/kobj.c Mon Jan 14 19:42:58 2019 +0000 @@ -25,6 +25,7 @@ /* * Copyright 2011 Bayard G. Bell <buffer.g.overflow@gmail.com>. * All rights reserved. Use is subject to license terms. + * Copyright (c) 2018, Joyent, Inc. */ /* @@ -3372,26 +3373,26 @@ symid_t *ip; #ifdef KOBJ_DEBUG - if (kobj_debug & D_SYMBOLS) { - static struct module *lastmp = NULL; - Sym *sp; - if (lastmp != mp) { - _kobj_printf(ops, - "krtld: symbol entry: file=%s\n", - mp->filename); - _kobj_printf(ops, - "krtld:\tsymndx\tvalue\t\t" - "symbol name\n"); - lastmp = mp; - } - sp = (Sym *)(mp->symtbl + - index * mp->symhdr->sh_entsize); - _kobj_printf(ops, "krtld:\t[%3d]", index); - _kobj_printf(ops, "\t0x%lx", sp->st_value); - _kobj_printf(ops, "\t%s\n", name); + if (kobj_debug & D_SYMBOLS) { + static struct module *lastmp = NULL; + Sym *sp; + if (lastmp != mp) { + _kobj_printf(ops, + "krtld: symbol entry: file=%s\n", + mp->filename); + _kobj_printf(ops, + "krtld:\tsymndx\tvalue\t\t" + "symbol name\n"); + lastmp = mp; } - + sp = (Sym *)(mp->symtbl + + index * mp->symhdr->sh_entsize); + _kobj_printf(ops, "krtld:\t[%3d]", index); + _kobj_printf(ops, "\t0x%lx", sp->st_value); + _kobj_printf(ops, "\t%s\n", name); + } #endif + for (ip = &mp->buckets[kobj_hash_name(name) % mp->hashsize]; *ip; ip = &mp->chains[*ip]) { ;
--- a/usr/src/uts/common/os/aio.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/os/aio.c Mon Jan 14 19:42:58 2019 +0000 @@ -25,6 +25,10 @@ */ /* + * Copyright (c) 2018, Joyent, Inc. + */ + +/* * Kernel asynchronous I/O. * This is only for raw devices now (as of Nov. 1993). */ @@ -304,7 +308,7 @@ offset_t off; - rvp->r_vals = 0; + rvp->r_vals = 0; #if defined(_LITTLE_ENDIAN) off = ((u_offset_t)uap[5] << 32) | (u_offset_t)uap[4]; #else
--- a/usr/src/uts/common/os/modconf.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/os/modconf.c Mon Jan 14 19:42:58 2019 +0000 @@ -23,6 +23,10 @@ * Use is subject to license terms. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ + #include <sys/types.h> #include <sys/systm.h> #include <sys/param.h> @@ -1336,7 +1340,7 @@ if (eswp->exec_func != NULL) { printf("exec type %x is already installed\n", *eswp->exec_magic); - return (EBUSY); /* it's already there! */ + return (EBUSY); /* it's already there! */ } rw_enter(eswp->exec_lock, RW_WRITER);
--- a/usr/src/uts/common/os/streamio.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/os/streamio.c Mon Jan 14 19:42:58 2019 +0000 @@ -2060,11 +2060,11 @@ * messages after it has done a * qprocsoff. */ - if (_OTHERQ(q)->q_next == NULL) - freemsg(bp); - else - qreply(q, bp); - return (0); + if (_OTHERQ(q)->q_next == NULL) + freemsg(bp); + else + qreply(q, bp); + return (0); } } freemsg(bp);
--- a/usr/src/uts/common/rpc/sec/authdesubr.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/rpc/sec/authdesubr.c Mon Jan 14 19:42:58 2019 +0000 @@ -23,6 +23,7 @@ * Copyright 2014 Gary Mills * Copyright 2001 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2018, Joyent, Inc. */ /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ @@ -307,7 +308,7 @@ mp2 = mp2->b_cont; } - freemsg(mp); + freemsg(mp); } thetime = (time_t)dummy;
--- a/usr/src/uts/common/rpc/sec_gss/rpcsec_gss.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/rpc/sec_gss/rpcsec_gss.c Mon Jan 14 19:42:58 2019 +0000 @@ -24,6 +24,10 @@ */ /* + * Copyright (c) 2018, Joyent, Inc. + */ + +/* * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved. * * $Header: @@ -277,9 +281,9 @@ NOT_NULL(cr); IS_ALIGNED(cr); #ifdef DEBUG -if (HASH(cache_key, uid) < 0) { - prom_printf("cache_key %p, cr %p\n", cache_key, (void *)cr); -} + if (HASH(cache_key, uid) < 0) { + prom_printf("cache_key %p, cr %p\n", cache_key, (void *)cr); + } #endif /*
--- a/usr/src/uts/common/vm/vm_seg.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/common/vm/vm_seg.c Mon Jan 14 19:42:58 2019 +0000 @@ -21,7 +21,7 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * Copyright (c) 2015, Joyent, Inc. + * Copyright (c) 2018, Joyent, Inc. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ @@ -1831,7 +1831,7 @@ if (svd->type == MAP_SHARED && svd->amp != NULL && svd->amp->swresv > 0) - return (B_FALSE); + return (B_FALSE); } return (B_TRUE); }
--- a/usr/src/uts/i86pc/cpu/generic_cpu/gcpu_main.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/i86pc/cpu/generic_cpu/gcpu_main.c Mon Jan 14 19:42:58 2019 +0000 @@ -29,6 +29,10 @@ */ /* + * Copyright (c) 2018, Joyent, Inc. + */ + +/* * Generic x86 CPU Module * * This CPU module is used for generic x86 CPUs when Solaris has no other @@ -269,11 +273,11 @@ cms_post_mpstartup(hdl); #ifndef __xpv - /* - * All cpu handles are initialized only once all cpus - * are started, so we can begin polling post mp startup. - */ - gcpu_mca_poll_start(hdl); + /* + * All cpu handles are initialized only once all cpus are started, so we + * can begin polling post mp startup. + */ + gcpu_mca_poll_start(hdl); #endif }
--- a/usr/src/uts/i86pc/io/mp_platform_common.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/i86pc/io/mp_platform_common.c Mon Jan 14 19:42:58 2019 +0000 @@ -22,7 +22,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2016 Nexenta Systems, Inc. * Copyright (c) 2017 by Delphix. All rights reserved. - * Copyright 2017 Joyent, Inc. + * Copyright (c) 2018, Joyent, Inc. */ /* * Copyright (c) 2010, Intel Corporation. @@ -1386,14 +1386,14 @@ * found or the root is reached. */ ipin = (child_devno + child_ipin) % PCI_INTD; - if (bridge_bus == 0 && apic_pci_bus_total == 1) - bridge_bus = (int)apic_single_pci_busid; - pci_irq = ((bridge_devno & 0x1f) << 2) | - (ipin & 0x3); - if ((*intrp = apic_find_io_intr_w_busid(pci_irq, - bridge_bus)) != NULL) { - return (pci_irq); - } + if (bridge_bus == 0 && apic_pci_bus_total == 1) + bridge_bus = (int)apic_single_pci_busid; + pci_irq = ((bridge_devno & 0x1f) << 2) | + (ipin & 0x3); + if ((*intrp = apic_find_io_intr_w_busid(pci_irq, + bridge_bus)) != NULL) { + return (pci_irq); + } dip = dipp; child_devno = bridge_devno; child_ipin = ipin;
--- a/usr/src/uts/i86pc/io/mp_platform_misc.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/i86pc/io/mp_platform_misc.c Mon Jan 14 19:42:58 2019 +0000 @@ -28,6 +28,10 @@ */ /* + * Copyright (c) 2018, Joyent, Inc. + */ + +/* * PSMI 1.1 extensions are supported only in 2.6 and later versions. * PSMI 1.2 extensions are supported only in 2.7 and later versions. * PSMI 1.3 and 1.4 extensions are supported in Solaris 10. @@ -1897,8 +1901,8 @@ (reps < apic_max_reps_clear_pending)); #ifdef DEBUG - if (rdt_entry & AV_PENDING) - apic_intr_deliver_timeouts++; + if (rdt_entry & AV_PENDING) + apic_intr_deliver_timeouts++; #endif /*
--- a/usr/src/uts/i86pc/os/cms.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/i86pc/os/cms.c Mon Jan 14 19:42:58 2019 +0000 @@ -28,6 +28,10 @@ * All rights reserved. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ + #include <sys/types.h> #include <sys/cpu_module_ms_impl.h> #include <sys/cpuvar.h> @@ -224,7 +228,7 @@ "version %d, kernel requires API version %d", modp->mod_modname, CMS_API_VERSION_TOPRINT(apiver), CMS_API_VERSION_TOPRINT(CMS_API_VERSION)); - return (NULL); + return (NULL); } if ((ops = cms_getops(modp)) == NULL)
--- a/usr/src/uts/intel/io/dktp/disk/cmdk.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/intel/io/dktp/disk/cmdk.c Mon Jan 14 19:42:58 2019 +0000 @@ -23,6 +23,10 @@ * Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ + #include <sys/scsi/scsi.h> #include <sys/dktp/cm.h> #include <sys/dktp/quetypes.h> @@ -826,7 +830,7 @@ case DDI_MODEL_NONE: { if (ddi_copyout(rwcmdp, outaddr, sizeof (struct dadkio_rwcmd), flag)) - return (EFAULT); + return (EFAULT); } } return (0);
--- a/usr/src/uts/intel/io/drm/radeon_state.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/intel/io/drm/radeon_state.c Mon Jan 14 19:42:58 2019 +0000 @@ -3,6 +3,10 @@ * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ + /* radeon_state.c -- State support for Radeon -*- linux-c -*- */ /* * Copyright 2000 VA Linux Systems, Inc., Fremont, California. @@ -32,8 +36,6 @@ * Kevin E. Martin <martin@valinux.com> */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "drmP.h" #include "drm.h" #include "drm_sarea.h" @@ -2244,7 +2246,7 @@ if (DRM_COPY_FROM_USER(&depth_boxes, clear.depth_boxes, sarea_priv->nbox * sizeof (depth_boxes[0]))) - return (EFAULT); + return (EFAULT); radeon_cp_dispatch_clear(dev, &clear, depth_boxes); @@ -2924,10 +2926,10 @@ int start = header.veclinear.addr_lo | (header.veclinear.addr_hi << 8); RING_LOCALS; - if (!sz) - return (0); - if (sz * 4 > cmdbuf->bufsz) - return (EINVAL); + if (!sz) + return (0); + if (sz * 4 > cmdbuf->bufsz) + return (EINVAL); BEGIN_RING(5 + sz); OUT_RING_REG(RADEON_SE_TCL_STATE_FLUSH, 0);
--- a/usr/src/uts/intel/io/intel_nhm/intel_nhmdrv.c Mon Dec 17 23:44:05 2018 +0000 +++ b/usr/src/uts/intel/io/intel_nhm/intel_nhmdrv.c Mon Jan 14 19:42:58 2019 +0000 @@ -24,6 +24,10 @@ * Use is subject to license terms. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ + #include <sys/types.h> #include <sys/time.h> #include <sys/nvpair.h> @@ -82,8 +86,8 @@ continue; kmem_free(inhm_mc_snapshot[i], inhm_mc_snapshotsz[i]); - inhm_mc_snapshot[i] = NULL; - inhm_mc_snapshotsz[i] = 0; + inhm_mc_snapshot[i] = NULL; + inhm_mc_snapshotsz[i] = 0; } inhm_mc_snapshotgen++; }