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

@@ -178,11 +178,10 @@
             sizeof (hermon_agent_handler_arg_t), KM_NOSLEEP);
         if (cb_args == NULL) {
                 (void) ibmf_free_msg(ibmf_handle, &msgp);
                 return;
         }
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*cb_args))
 
         /* Fill in the callback args */
         cb_args->ahd_ibmfhdl    = ibmf_handle;
         cb_args->ahd_ibmfmsg    = msgp;
         cb_args->ahd_agentlist  = args;

@@ -324,13 +323,10 @@
         ib_mad_hdr_t                    *madhdrp;
         ibmf_retrans_t                  retrans;
         uint_t                          port;
         int                             status;
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*((sm_portinfo_t *)madpinfop)))
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(curpinfo))
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(tmadpinfo))
         /* Extract the necessary info from the callback args parameter */
         agent_args  = (hermon_agent_handler_arg_t *)cb_args;
         ibmf_handle = agent_args->ahd_ibmfhdl;
         msgp        = agent_args->ahd_ibmfmsg;
         curr        = agent_args->ahd_agentlist;

@@ -358,11 +354,10 @@
          * special "Hermon Trap" and forwards it here to the driver's SMA.
          * It is then our responsibility here to fill in the Trap MAD's DLID
          * for forwarding to the real Master SM (as programmed in the port's
          * PortInfo.MasterSMLID field.)
          */
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(msgp->im_local_addr))
         if (HERMON_IS_SPECIAL_TRAP_MAD(msgp)) {
                 msgp->im_local_addr.ia_remote_lid =
                     hermon_get_smlid(state, port);
         } else {
                 int isSMSet, isReregSuppd;

@@ -800,14 +795,10 @@
          * the responsibility falls on Hermon driver software to inspect the
          * MADs and update those fields as appropriate (see section 14.2.2
          * of the IBA specification, rev 1.1)
          */
         if (HERMON_MAD_IS_DR(rmadhdrp)) {
-
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*((sm_dr_mad_hdr_t *)rmadhdrp)))
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*((sm_dr_mad_hdr_t *)smadhdrp)))
-
                 /*
                  * Set the "Direction" bit to one.  This indicates that this
                  * is now directed route response
                  */
                 HERMON_DRMAD_SET_DIRECTION(rmadhdrp);