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

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/vcons.c
          +++ new/usr/src/uts/common/io/vcons.c
↓ open down ↓ 105 lines elided ↑ open up ↑
 106  106  
 107  107  extern void     wc_get_size(vc_state_t *pvc);
 108  108  extern boolean_t consconfig_console_is_tipline(void);
 109  109  
 110  110  
 111  111  minor_t vc_last_console = VT_MINOR_INVALID;     /* the last used console */
 112  112  volatile uint_t vc_target_console;              /* arg (1..n) */
 113  113  
 114  114  static volatile minor_t vc_inuse_max_minor = 0;
 115  115  static list_t vc_waitactive_list;
 116      -_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", vc_target_console))
 117      -_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", vc_last_console))
 118      -_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", vc_inuse_max_minor))
 119      -_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", vc_waitactive_list))
 120  116  
 121  117  static int vt_pending_vtno = -1;
 122  118  kmutex_t vt_pending_vtno_lock;
 123      -_NOTE(MUTEX_PROTECTS_DATA(vt_pending_vtno_lock, vt_pending_vtno))
 124  119  
 125  120  static int vt_activate(uint_t vt_no, cred_t *credp);
 126  121  static void vt_copyout(queue_t *qp, mblk_t *mp, mblk_t *tmp, uint_t size);
 127  122  static void vt_copyin(queue_t *qp, mblk_t *mp, uint_t size);
 128  123  static void vt_iocnak(queue_t *qp, mblk_t *mp, int error);
 129  124  static void vt_iocack(queue_t *qp, mblk_t *mp);
 130  125  
 131  126  static uint_t vt_minor2arg(minor_t minor);
 132  127  static minor_t vt_arg2minor(uint_t arg);
 133  128  
↓ open down ↓ 1206 lines elided ↑ open up ↑
1340 1335  
1341 1336          return (1);
1342 1337  }
1343 1338  
1344 1339  /*
1345 1340   * Only called from wc init().
1346 1341   */
1347 1342  void
1348 1343  vt_init(void)
1349 1344  {
1350      -#ifdef  __lock_lint
1351      -        ASSERT(NO_COMPETING_THREADS);
1352      -#endif
1353      -
1354 1345          avl_create(&vc_avl_root, vc_avl_compare, sizeof (vc_state_t),
1355 1346              offsetof(vc_state_t, vc_avl_node));
1356 1347  
1357 1348          list_create(&vc_waitactive_list, sizeof (vc_waitactive_msg_t),
1358 1349              offsetof(vc_waitactive_msg_t, wa_list_node));
1359 1350  
1360 1351          mutex_init(&vc_lock, NULL, MUTEX_DRIVER, NULL);
1361 1352          mutex_init(&vt_pending_vtno_lock, NULL, MUTEX_DRIVER, NULL);
1362 1353  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX