Print this page
8368 remove warlock leftovers from usr/src/uts
@@ -128,17 +128,10 @@
#include <sys/tem.h>
#include <sys/wscons.h>
#include <sys/vt_impl.h>
/* streams stuff */
-_NOTE(SCHEME_PROTECTS_DATA("Unshared data", copyreq))
-_NOTE(SCHEME_PROTECTS_DATA("Unshared data", copyresp))
-_NOTE(SCHEME_PROTECTS_DATA("Unshared data", datab))
-_NOTE(SCHEME_PROTECTS_DATA("Unshared data", iocblk))
-_NOTE(SCHEME_PROTECTS_DATA("Unshared data", msgb))
-_NOTE(SCHEME_PROTECTS_DATA("Unshared data", queue))
-
#define MINLINES 10
#define MAXLINES 48
#define LOSCREENLINES 34
#define HISCREENLINES 48
@@ -159,24 +152,10 @@
unsigned int wc_kb_getpolledio_id; /* id for kb CONSOPENPOLLEDIO */
queue_t *wc_pending_wq;
mblk_t *wc_pending_link; /* I_PLINK pending for kb polledio */
} wscons;
-/*
- * This module has a D_MTPERMOD inner perimeter, so we don't need to protect
- * the variables only shared within this module
- */
-_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", wscons))
-_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", wscons_state))
-_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", vt_stat))
-_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", vc_waitactive_msg))
-_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", tty_common))
-_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", vt_mode))
-_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", vt_dispinfo))
-_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", winsize))
-_NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data", vc_last_console))
-
#ifdef _HAVE_TEM_FIRMWARE
ssize_t wc_cons_wrtvec(promif_redir_arg_t arg, uchar_t *s, size_t n);
#endif /* _HAVE_TEM_FIRMWARE */
static int wcopen(queue_t *, dev_t *, int, int, cred_t *);
@@ -398,12 +377,10 @@
static void
wc_init_polledio(void)
{
static boolean_t polledio_inited = B_FALSE;
- _NOTE(SCHEME_PROTECTS_DATA("D_MTPERMOD protected data",
- polledio_inited))
if (polledio_inited)
return;
polledio_inited = B_TRUE;