8368 remove warlock leftovers from usr/src/uts

*** 665,696 ****
  };
  
  static int aac_tick = AAC_DEFAULT_TICK; /* tick for the internal timer */
  static uint32_t aac_timebase = 0;       /* internal timer in seconds */
  
- /*
-  * Warlock directives
-  *
-  * Different variables with the same types have to be protected by the
-  * same mutex; otherwise, warlock will complain with "variables don't
-  * seem to be protected consistently". For example,
-  * aac_softstate::{q_wait, q_comp} are type of aac_cmd_queue, and protected
-  * by aac_softstate::{io_lock, q_comp_mutex} respectively. We have to
-  * declare them as protected explictly at aac_cmd_dequeue().
-  */
- _NOTE(SCHEME_PROTECTS_DATA("unique per pkt", scsi_pkt scsi_cdb scsi_status \
-     scsi_arq_status scsi_descr_sense_hdr scsi_information_sense_descr \
-     mode_format mode_geometry mode_header aac_cmd))
- _NOTE(SCHEME_PROTECTS_DATA("unique per aac_cmd", aac_fib ddi_dma_cookie_t \
-     aac_sge))
- _NOTE(SCHEME_PROTECTS_DATA("unique per aac_fib", aac_blockread aac_blockwrite \
-     aac_blockread64 aac_raw_io aac_sg_entry aac_sg_entry64 aac_sg_entryraw \
-     aac_sg_table aac_srb))
- _NOTE(SCHEME_PROTECTS_DATA("unique to sync fib and cdb", scsi_inquiry))
- _NOTE(SCHEME_PROTECTS_DATA("stable data", scsi_device scsi_address))
- _NOTE(SCHEME_PROTECTS_DATA("unique to scsi_transport", buf))
- 
  int
  _init(void)
  {
          int rval = 0;
  
--- 665,674 ----
*** 1070,1080 ****
          struct aac_softstate *softs = AAC_DIP2SOFTS(dip);
  
          if (softs == NULL)
                  return (DDI_FAILURE);
  
-         _NOTE(ASSUMING_PROTECTED(softs->state))
          AAC_DISABLE_INTR(softs);
  
          return (DDI_SUCCESS);
  }
  
--- 1048,1057 ----
*** 1774,1786 ****
   */
  static void
  aac_set_pkt_reason(struct aac_softstate *softs, struct aac_cmd *acp,
      uchar_t reason, uint_t stat)
  {
- #ifndef __lock_lint
          _NOTE(ARGUNUSED(softs))
- #endif
          if (acp->pkt->pkt_reason == CMD_CMPLT)
                  acp->pkt->pkt_reason = reason;
          acp->pkt->pkt_statistics |= stat;
  }
  
--- 1751,1761 ----
*** 3145,3156 ****
  static struct aac_cmd *
  aac_cmd_dequeue(struct aac_cmd_queue *q)
  {
          struct aac_cmd *acp;
  
-         _NOTE(ASSUMING_PROTECTED(*q))
- 
          if ((acp = q->q_head) != NULL) {
                  if ((q->q_head = acp->next) != NULL)
                          acp->next = NULL;
                  else
                          q->q_tail = (struct aac_cmd *)&q->q_head;
--- 3120,3129 ----
*** 4144,4154 ****
  static int
  aac_tran_tgt_init(dev_info_t *hba_dip, dev_info_t *tgt_dip,
      scsi_hba_tran_t *tran, struct scsi_device *sd)
  {
          struct aac_softstate *softs = AAC_TRAN2SOFTS(tran);
! #if defined(DEBUG) || defined(__lock_lint)
          int ctl = ddi_get_instance(softs->devinfo_p);
  #endif
          uint16_t tgt = sd->sd_address.a_target;
          uint8_t lun = sd->sd_address.a_lun;
          struct aac_device *dvp;
--- 4117,4127 ----
  static int
  aac_tran_tgt_init(dev_info_t *hba_dip, dev_info_t *tgt_dip,
      scsi_hba_tran_t *tran, struct scsi_device *sd)
  {
          struct aac_softstate *softs = AAC_TRAN2SOFTS(tran);
! #ifdef DEBUG
          int ctl = ddi_get_instance(softs->devinfo_p);
  #endif
          uint16_t tgt = sd->sd_address.a_target;
          uint8_t lun = sd->sd_address.a_lun;
          struct aac_device *dvp;
*** 4227,4239 ****
  
  static void
  aac_tran_tgt_free(dev_info_t *hba_dip, dev_info_t *tgt_dip,
      scsi_hba_tran_t *hba_tran, struct scsi_device *sd)
  {
- #ifndef __lock_lint
          _NOTE(ARGUNUSED(hba_dip, tgt_dip, hba_tran))
- #endif
  
          struct aac_softstate *softs = SD2AAC(sd);
          int tgt = sd->sd_address.a_target;
  
          mutex_enter(&softs->io_lock);
--- 4200,4210 ----
*** 5385,5396 ****
                  if (ap->a_target < AAC_MAX_LD) {
                          acp->dvp = &softs->containers[ap->a_target].dev;
                          acp->aac_cmd_fib = softs->aac_cmd_fib;
                          acp->ac_comp = aac_ld_complete;
                  } else {
-                         _NOTE(ASSUMING_PROTECTED(softs->nondasds))
- 
                          acp->dvp = &softs->nondasds[AAC_PD(ap->a_target)].dev;
                          acp->aac_cmd_fib = softs->aac_cmd_fib_scsi;
                          acp->ac_comp = aac_pd_complete;
                  }
          } else {
--- 5356,5365 ----