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

@@ -111,18 +111,13 @@
 minor_t vc_last_console = VT_MINOR_INVALID;     /* the last used console */
 volatile uint_t vc_target_console;              /* arg (1..n) */
 
 static volatile minor_t vc_inuse_max_minor = 0;
 static list_t vc_waitactive_list;
-_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", vc_target_console))
-_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", vc_last_console))
-_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", vc_inuse_max_minor))
-_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", vc_waitactive_list))
 
 static int vt_pending_vtno = -1;
 kmutex_t vt_pending_vtno_lock;
-_NOTE(MUTEX_PROTECTS_DATA(vt_pending_vtno_lock, vt_pending_vtno))
 
 static int vt_activate(uint_t vt_no, cred_t *credp);
 static void vt_copyout(queue_t *qp, mblk_t *mp, mblk_t *tmp, uint_t size);
 static void vt_copyin(queue_t *qp, mblk_t *mp, uint_t size);
 static void vt_iocnak(queue_t *qp, mblk_t *mp, int error);

@@ -1345,14 +1340,10 @@
  * Only called from wc init().
  */
 void
 vt_init(void)
 {
-#ifdef  __lock_lint
-        ASSERT(NO_COMPETING_THREADS);
-#endif
-
         avl_create(&vc_avl_root, vc_avl_compare, sizeof (vc_state_t),
             offsetof(vc_state_t, vc_avl_node));
 
         list_create(&vc_waitactive_list, sizeof (vc_waitactive_msg_t),
             offsetof(vc_waitactive_msg_t, wa_list_node));