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

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/ecpp.c
          +++ new/usr/src/uts/common/io/ecpp.c
↓ open down ↓ 460 lines elided ↑ open up ↑
 461  461  static const struct prn_timeouts prn_timeouts_default = {
 462  462          FWD_TIMEOUT_DEFAULT,    /* forward timeout */
 463  463          REV_TIMEOUT_DEFAULT     /* reverse timeout */
 464  464  };
 465  465  
 466  466  static int ecpp_isr_max_delay = ECPP_ISR_MAX_DELAY;
 467  467  static int ecpp_def_timeout = 90;  /* left in for 2.7 compatibility */
 468  468  
 469  469  static void    *ecppsoft_statep;
 470  470  
 471      -/*
 472      - * STREAMS framework manages locks for these structures
 473      - */
 474      -_NOTE(SCHEME_PROTECTS_DATA("unique per call", iocblk))
 475      -_NOTE(SCHEME_PROTECTS_DATA("unique per call", datab))
 476      -_NOTE(SCHEME_PROTECTS_DATA("unique per call", msgb))
 477      -_NOTE(SCHEME_PROTECTS_DATA("unique per call", queue))
 478      -_NOTE(SCHEME_PROTECTS_DATA("unique per call", copyreq))
 479      -_NOTE(SCHEME_PROTECTS_DATA("unique per call", stroptions))
 480      -
 481  471  struct module_info ecppinfo = {
 482  472          /* id, name, min pkt siz, max pkt siz, hi water, low water */
 483  473          42, "ecpp", 0, IO_BLOCK_SZ, ECPPHIWAT, ECPPLOWAT
 484  474  };
 485  475  
 486  476  static struct qinit ecpp_rinit = {
 487  477          putq, ecpp_rsrv, ecpp_open, ecpp_close, NULL, &ecppinfo, NULL
 488  478  };
 489  479  
 490  480  static struct qinit ecpp_wint = {
↓ open down ↓ 3079 lines elided ↑ open up ↑
3570 3560          static  char    *lastfmt;
3571 3561          char            msg_buffer[255];
3572 3562          va_list ap;
3573 3563          time_t  now;
3574 3564  
3575 3565          if (!ecpp_debug) {
3576 3566                  return;
3577 3567          }
3578 3568  
3579 3569          /*
3580      -         * This function is supposed to be a quick non-blockable
3581      -         * wrapper for cmn_err(9F), which provides a sensible degree
3582      -         * of debug message throttling.  Not using any type of lock
3583      -         * is a requirement, but this also leaves two static variables
3584      -         * - last and lastfmt - unprotected. However, this will not do
3585      -         * any harm to driver functionality, it can only weaken throttling.
3586      -         * The following directive asks warlock to not worry about these
3587      -         * variables.
3588      -         */
3589      -        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(last, lastfmt))
3590      -
3591      -        /*
3592 3570           * Don't print same error message too often.
3593 3571           */
3594 3572          now = gethrestime_sec();
3595 3573          if ((last == (now & ~1)) && (lastfmt == fmt))
3596 3574                  return;
3597 3575  
3598 3576          last = now & ~1;
3599 3577          lastfmt = fmt;
3600 3578  
3601 3579          va_start(ap, fmt);
↓ open down ↓ 2783 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX