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

@@ -82,24 +82,20 @@
         void *cm_private;
 
         IBTF_DPRINTF_L3(ibtf_cm, "ibtl_cm_get_chan_private(%p)", chan);
         mutex_enter(&chan->ch_cm_mutex);
         cm_private = chan->ch_cm_private;
-#ifndef __lock_lint
         /* IBCM will call the release function if cm_private is non-NULL */
         if (cm_private == NULL)
-#endif
                 mutex_exit(&chan->ch_cm_mutex);
         return (cm_private);
 }
 
 void
 ibtl_cm_release_chan_private(ibt_channel_hdl_t chan)
 {
-#ifndef __lock_lint
         mutex_exit(&chan->ch_cm_mutex);
-#endif
 }
 
 void
 ibtl_cm_wait_chan_private(ibt_channel_hdl_t chan)
 {

@@ -508,12 +504,10 @@
                 return (retval);
         }
 
         p_listp = *port_list_p;
 
-        _NOTE(NO_COMPETING_THREADS_NOW)
-
         for (i = 0; i < count - 1; i++) {
                 for (j = 0; j < count - 1 - i; j++) {
                         if (p_listp[j].p_hca_guid != p_listp[j+1].p_hca_guid) {
                                 multi_hca = B_TRUE;
                                 break;

@@ -574,14 +568,10 @@
                                 p_listp[0] = tmp;
                         }
                 }
         }
 
-#ifndef lint
-        _NOTE(COMPETING_THREADS_NOW)
-#endif
-
         IBTF_DPRINTF_L3(ibtf_cm, "ibtl_cm_get_active_plist: "
             "Returned <%d> entries @0x%p", count, *port_list_p);
 
         return (retval);
 }

@@ -593,14 +583,11 @@
         int count;
 
         IBTF_DPRINTF_L3(ibtf_cm, "ibtl_cm_free_active_plist(%p)", plist);
 
         if (plist != NULL) {
-                _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*plist))
                 count = plist->p_count;
-                _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*plist))
-
                 kmem_free(plist, count * sizeof (ibtl_cm_port_list_t));
         }
 }
 
 /*