Print this page
8368 remove warlock leftovers from usr/src/uts

@@ -871,12 +871,10 @@
             KM_SLEEP);
         tbl_size = (1 << state->hs_cfg_profile->cp_log_max_pkeytbl);
         pkey_tbl = (ib_pkey_t *)kmem_zalloc(tbl_size * sizeof (ib_pkey_t),
             KM_SLEEP);
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*sgid_tbl, *pkey_tbl))
-
         /*
          * Setup the number of ports, then loop through all ports and
          * query properties of each.
          */
         info.ap_num_ports = (uint8_t)state->hs_cfg_profile->cp_num_ports;

@@ -949,12 +947,10 @@
         uint_t                  tbl_size, loopmax, max_usec;
         ib_gid_t                *sgid_tbl;
         ib_pkey_t               *pkey_tbl;
         int                     j, iter, ret;
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(lstate))
-
         /*
          * Access to Hemron VTS ioctls is not allowed in "maintenance mode".
          */
         if (state->hs_operational_mode == HERMON_MAINTENANCE_MODE) {
                 return (EFAULT);

@@ -2147,12 +2143,10 @@
         hdl = hermon_get_pcihdl(state);
 
         /* Determine the bank setting from the address */
         bank = addr & HERMON_HW_FLASH_BANK_MASK;
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(state->hs_fw_flashbank))
-
         /*
          * If the bank is different from the currently set bank, we need to
          * change it.  Also, if an 'addr' of 0 is given, this allows the
          * capability to force the flash bank to 0.  This is useful at init
          * time to initially set the bank value

@@ -2770,12 +2764,10 @@
 static void
 hermon_loopback_free_qps(hermon_loopback_state_t *lstate)
 {
         int i;
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*lstate))
-
         if (lstate->hls_tx.hlc_qp_hdl != NULL) {
                 (void) hermon_qp_free(lstate->hls_state,
                     &lstate->hls_tx.hlc_qp_hdl, IBC_FREE_QP_AND_QPN, NULL,
                     HERMON_NOSLEEP);
         }

@@ -2833,12 +2825,10 @@
  * hermon_loopback_init
  */
 static int
 hermon_loopback_init(hermon_state_t *state, hermon_loopback_state_t *lstate)
 {
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*lstate))
-
         lstate->hls_hca_hdl = (ibc_hca_hdl_t)state;
         lstate->hls_status  = hermon_pd_alloc(lstate->hls_state,
             &lstate->hls_pd_hdl, HERMON_NOSLEEP);
         if (lstate->hls_status != IBT_SUCCESS) {
                 lstate->hls_err = HERMON_LOOPBACK_PROT_DOMAIN_ALLOC_FAIL;

@@ -2897,12 +2887,10 @@
  */
 static int
 hermon_loopback_alloc_mem(hermon_loopback_state_t *lstate,
     hermon_loopback_comm_t *comm, int sz)
 {
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*comm))
-
         /* Allocate buffer of specified size */
         comm->hlc_buf_sz = sz;
         comm->hlc_buf    = kmem_zalloc(sz, KM_NOSLEEP);
         if (comm->hlc_buf == NULL) {
                 return (EFAULT);

@@ -2917,12 +2905,10 @@
 
         comm->hlc_status = hermon_mr_register(lstate->hls_state,
             lstate->hls_pd_hdl, &comm->hlc_memattr, &comm->hlc_mrhdl,
             NULL, HERMON_MPT_DMPT);
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*comm->hlc_mrhdl))
-
         comm->hlc_mrdesc.md_vaddr  = comm->hlc_mrhdl->mr_bindinfo.bi_addr;
         comm->hlc_mrdesc.md_lkey   = comm->hlc_mrhdl->mr_lkey;
         comm->hlc_mrdesc.md_rkey   = comm->hlc_mrhdl->mr_rkey;
         if (comm->hlc_status != IBT_SUCCESS) {
                 return (EFAULT);

@@ -2938,13 +2924,10 @@
     hermon_loopback_comm_t *comm)
 {
         uint32_t                i, real_size;
         hermon_qp_info_t                qpinfo;
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*comm))
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*lstate))
-
         /* Allocate send and recv CQs */
         for (i = 0; i < 2; i++) {
                 bzero(&comm->hlc_cq_attr, sizeof (ibt_cq_attr_t));
                 comm->hlc_cq_attr.cq_size = 128;
                 comm->hlc_status = hermon_cq_alloc(lstate->hls_state,

@@ -2986,13 +2969,10 @@
  */
 static int
 hermon_loopback_modify_qp(hermon_loopback_state_t *lstate,
     hermon_loopback_comm_t *comm, uint_t qp_num)
 {
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*comm))
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*lstate))
-
         /* Modify QP to INIT */
         hermon_loopback_init_qp_info(lstate, comm);
         comm->hlc_qp_info.qp_state = IBT_STATE_INIT;
         comm->hlc_status = hermon_qp_modify(lstate->hls_state, comm->hlc_qp_hdl,
             IBT_CEP_SET_STATE, &comm->hlc_qp_info, &comm->hlc_queue_sizes);

@@ -3070,12 +3050,10 @@
 hermon_loopback_post_send(hermon_loopback_state_t *lstate,
     hermon_loopback_comm_t *tx, hermon_loopback_comm_t *rx)
 {
         int      ret;
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*tx))
-
         bzero(&tx->hlc_sgl, sizeof (ibt_wr_ds_t));
         bzero(&tx->hlc_wr, sizeof (ibt_send_wr_t));
 
         /* Initialize local address for TX buffer */
         tx->hlc_sgl.ds_va   = tx->hlc_mrdesc.md_vaddr;

@@ -3107,12 +3085,10 @@
  */
 static int
 hermon_loopback_poll_cq(hermon_loopback_state_t *lstate,
     hermon_loopback_comm_t *comm)
 {
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*comm))
-
         comm->hlc_wc.wc_status  = 0;
         comm->hlc_num_polled    = 0;
         comm->hlc_status = hermon_cq_poll(lstate->hls_state,
             comm->hlc_cqhdl[0], &comm->hlc_wc, 1, &comm->hlc_num_polled);
         if ((comm->hlc_status == IBT_SUCCESS) &&