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

@@ -466,20 +466,10 @@
 static int ecpp_isr_max_delay = ECPP_ISR_MAX_DELAY;
 static int ecpp_def_timeout = 90;  /* left in for 2.7 compatibility */
 
 static void    *ecppsoft_statep;
 
-/*
- * STREAMS framework manages locks for these structures
- */
-_NOTE(SCHEME_PROTECTS_DATA("unique per call", iocblk))
-_NOTE(SCHEME_PROTECTS_DATA("unique per call", datab))
-_NOTE(SCHEME_PROTECTS_DATA("unique per call", msgb))
-_NOTE(SCHEME_PROTECTS_DATA("unique per call", queue))
-_NOTE(SCHEME_PROTECTS_DATA("unique per call", copyreq))
-_NOTE(SCHEME_PROTECTS_DATA("unique per call", stroptions))
-
 struct module_info ecppinfo = {
         /* id, name, min pkt siz, max pkt siz, hi water, low water */
         42, "ecpp", 0, IO_BLOCK_SZ, ECPPHIWAT, ECPPLOWAT
 };
 

@@ -3575,22 +3565,10 @@
         if (!ecpp_debug) {
                 return;
         }
 
         /*
-         * This function is supposed to be a quick non-blockable
-         * wrapper for cmn_err(9F), which provides a sensible degree
-         * of debug message throttling.  Not using any type of lock
-         * is a requirement, but this also leaves two static variables
-         * - last and lastfmt - unprotected. However, this will not do
-         * any harm to driver functionality, it can only weaken throttling.
-         * The following directive asks warlock to not worry about these
-         * variables.
-         */
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(last, lastfmt))
-
-        /*
          * Don't print same error message too often.
          */
         now = gethrestime_sec();
         if ((last == (now & ~1)) && (lastfmt == fmt))
                 return;