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

@@ -82,12 +82,10 @@
         uint32_t                log_cq_size, uarpg;
         uint_t                  cq_is_umap;
         uint32_t                status, flag;
         hermon_cq_sched_t       *cq_schedp;
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*cq_attr))
-
         /*
          * Determine whether CQ is being allocated for userland access or
          * whether it is being allocated for kernel access.  If the CQ is
          * being allocated for userland access, then lookup the UAR
          * page number for the current process.  Note:  If this is not found

@@ -136,11 +134,10 @@
         if (status != DDI_SUCCESS) {
                 status = IBT_INSUFF_RESOURCE;
                 goto cqalloc_fail2;
         }
         cq = (hermon_cqhdl_t)rsrc->hr_addr;
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*cq))
         cq->cq_is_umap = cq_is_umap;
         cq->cq_cqnum = cqc->hr_indx;    /* just use index, implicit in Hermon */
         cq->cq_intmod_count = 0;
         cq->cq_intmod_usec = 0;
 

@@ -220,11 +217,10 @@
         if (status != DDI_SUCCESS) {
                 status = IBT_INSUFF_RESOURCE;
                 goto cqalloc_fail4;
         }
         buf = (hermon_hw_cqe_t *)cq->cq_cqinfo.qa_buf_aligned;
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*buf))
 
         /*
          * The ownership bit of the CQE's is set by the HW during the process
          * of transferrring ownership of the CQ (PRM 09.35c, 14.2.1, note D1
          *

@@ -248,11 +244,10 @@
             HERMON_CQ_CMPT);
         if (status != DDI_SUCCESS) {
                 status = IBT_INSUFF_RESOURCE;
                 goto cqalloc_fail5;
         }
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr))
 
         cq->cq_erreqnum = HERMON_CQ_ERREQNUM_GET(state);
         if (cq_attr->cq_flags & IBT_CQ_HID) {
                 if (!HERMON_HID_VALID(state, cq_attr->cq_hid)) {
                         IBTF_DPRINTF_L2("CQalloc", "bad handler id 0x%x",

@@ -486,11 +481,10 @@
          * number has been freed.
          */
         hermon_icm_set_num_to_hdl(state, HERMON_CQC, cqc->hr_indx, NULL);
 
         mutex_exit(&cq->cq_lock);
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*cq))
 
         /*
          * Reclaim CQC entry from hardware (using the Hermon HW2SW_CQ
          * firmware command).  If the ownership transfer fails for any reason,
          * then it is an indication that something (either in HW or SW) has

@@ -649,11 +643,10 @@
                 kmem_free(resize_hdl, sizeof (struct hermon_sw_cq_s));
                 status = IBT_INSUFF_RESOURCE;
                 goto cqresize_fail;
         }
         buf = (hermon_hw_cqe_t *)new_cqinfo.qa_buf_aligned;
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*buf))
 
         /*
          * No initialization of the cq is needed - the command will do it
          */
 

@@ -677,11 +670,10 @@
                 /* free the resize handle */
                 kmem_free(resize_hdl, sizeof (struct hermon_sw_cq_s));
                 status = IBT_INSUFF_RESOURCE;
                 goto cqresize_fail;
         }
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr))
 
         /*
          * Now we grab the CQ lock.  Since we will be updating the actual
          * CQ location and the producer/consumer indexes, we should hold
          * the lock.

@@ -1318,11 +1310,10 @@
          * Parse the CQE opcode to determine completion type.  This will set
          * not only the type of the completion, but also any flags that might
          * be associated with it (e.g. whether immediate data is present).
          */
         flags = IBT_WC_NO_FLAGS;
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(state->hs_fcoib_may_be_running))
         if (HERMON_CQE_SENDRECV_GET(cq, cqe) != HERMON_COMPLETION_RECV) {
 
                 /* Send CQE */
                 switch (opcode) {
                 case HERMON_CQE_SND_RDMAWR_IMM: