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

@@ -87,11 +87,10 @@
 void    *ibtl_cm_clnt_private;
 void    *ibtl_dm_clnt_private;
 void    *ibtl_ibma_clnt_private;
 
 extern int ib_hw_status;
-_NOTE(SCHEME_PROTECTS_DATA("Scheme protects data", ib_hw_status))
 
 /*
  * Misc Module Declarations.
  */
 extern struct mod_ops mod_miscops;

@@ -304,23 +303,17 @@
         }
 
         /* Allocate the memory for per-client-device info structure */
         clntp = kmem_zalloc(sizeof (ibtl_clnt_t), KM_SLEEP);
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(clntp->clnt_modinfop,
-            clntp->clnt_dip, clntp->clnt_name, clntp->clnt_async_cnt,
-            clntp->clnt_private))
         /* Update the Client info structure */
         clntp->clnt_modinfop = mod_infop;       /* IBT Client's Mod Info */
         clntp->clnt_private = clnt_private;     /* IBT Client's private */
         clntp->clnt_dip = arg;                  /* IBT Client's dip */
         clntp->clnt_async_cnt = 0;
         /* using a count of 7 below guarantees it is NULL terminated */
         (void) strncpy(clntp->clnt_name, mod_infop->mi_clnt_name, 7);
-        _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(clntp->clnt_modinfop,
-            clntp->clnt_dip, clntp->clnt_name, clntp->clnt_async_cnt,
-            clntp->clnt_private))
 
         /*
          * Update Client Device Instance List.
          */
         clntp->clnt_list_link = ibtl_clnt_list;

@@ -1155,14 +1148,11 @@
         ibtl_hca_port_kstat_t   *pks;
         int                     i;
 
         IBTF_DPRINTF_L3(ibtf, "ibtl_kstat_fini(hca_devp = 0x%p)", hca_devp);
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*hca_devp))
-
         pks = hca_devp->hd_hca_port_ks_info;
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*pks))
 
         if (pks == NULL)
                 return;
 
         for (i = 0; i < hca_devp->hd_hca_attr->hca_nports; i++, pks++) {

@@ -1271,24 +1261,17 @@
         ibt_hca_portinfo_t      *p;
 
         IBTF_DPRINTF_L4(ibtf, "ibtl_kstat_pkeys_update(ksp = 0x%p, rw = %d)",
             ksp, rw);
 
-#ifndef __lock_lint
         ASSERT(MUTEX_HELD(&ibtl_clnt_list_mutex));
-#endif
 
         if (rw == KSTAT_WRITE)
                 return (EACCES);
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*ksp))
-
         pks = ksp->ks_private;
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*pks))
-
         hca_devp = pks->pks_hca_devp;
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*hca_devp))
 
         /*
          * Point kstat data to the pkey table in the portinfo cache.
          */