8368 remove warlock leftovers from usr/src/uts

@@ -2706,11 +2706,10 @@
 }
 
 static void
 cmlb_swap_efi_gpt(efi_gpt_t *e)
 {
-        _NOTE(ASSUMING_PROTECTED(*e))
         e->efi_gpt_Signature = LE_64(e->efi_gpt_Signature);
         e->efi_gpt_Revision = LE_32(e->efi_gpt_Revision);
         e->efi_gpt_HeaderSize = LE_32(e->efi_gpt_HeaderSize);
         e->efi_gpt_HeaderCRC32 = LE_32(e->efi_gpt_HeaderCRC32);
         e->efi_gpt_MyLBA = LE_64(e->efi_gpt_MyLBA);

@@ -2730,11 +2729,10 @@
 static void
 cmlb_swap_efi_gpe(int nparts, efi_gpe_t *p)
 {
         int i;
 
-        _NOTE(ASSUMING_PROTECTED(*p))
         for (i = 0; i < nparts; i++) {
                 UUID_LE_CONVERT(p[i].efi_gpe_PartitionTypeGUID,
                     p[i].efi_gpe_PartitionTypeGUID);
                 p[i].efi_gpe_StartingLBA = LE_64(p[i].efi_gpe_StartingLBA);
                 p[i].efi_gpe_EndingLBA = LE_64(p[i].efi_gpe_EndingLBA);

@@ -3854,11 +3852,10 @@
         /*
          * Set the map for all logical partitions.  We lock
          * the priority just to make sure an interrupt doesn't
          * come in while the map is half updated.
          */
-        _NOTE(DATA_READABLE_WITHOUT_LOCK(cmlb_lun::cl_solaris_size))
         mutex_enter(CMLB_MUTEX(cl));
 
         if (cl->cl_blockcount > CMLB_OLDVTOC_LIMIT) {
                 mutex_exit(CMLB_MUTEX(cl));
                 return (ENOTSUP);

@@ -5175,15 +5172,10 @@
                         mutex_exit(CMLB_MUTEX(cl));
                         kmem_free(mboot, cl->cl_sys_blocksize);
                         return (rval);
                 }
         }
-
-#ifdef __lock_lint
-        cmlb_setup_default_geometry(cl, tg_cookie);
-#endif
-
 #else
         if (rval == 0) {
                 /*
                  * mboot has been written successfully.
                  * set up the default geometry and VTOC