[illumos-gate merge]

commit 5eadbc30703231f9c4bae46b75a14b0abf05268c
    12155 libdemangle: variable 'result' might be clobbered by 'longjmp' or 'vfork'
commit 52e32d3842d8ce38bd888b33fb2e2998eab03619
    12578 pcf8574: NULL pointer errors
commit d35ce8d71dd4f0ec672492fe393e3d5af4145a48
    12561 rootnex: NULL pointer errors
commit 87e3123fcf08cf5c377d6a69a15ea9f22d06d024
    12560 zsh: NULL pointer errors
commit d1b674c50672a564fe30c5973fb7d56c97400713
    12572 pcipsy: NULL pointer errors
commit a0fef47a74bc2bafe7fd32b012067b94a92892bd
    12573 adm1031: NULL pointer errors
commit 8349c89ddec52c30180aa31f25699602b8d6c4a9
    12549 socal: NULL pointer errors
commit 52c783061613842808f641364c51ebe598b482d4
    12567 fd: NULL pointer errors
commit 3150e93da4db1a6b51b0046c3b48412cb427137c
    12555 pcicfg: NULL pointer errors
commit 54dcb32ca057468697455a0e99cc70f974c691b0
    12574 lm75: NULL pointer errors
commit 4beb21b1d94ca2e60959502f85aaae16f22c01e2
    12553 want segment driver for vmm applications

	Conflicts:
	usr/src/uts/i86pc/vm/seg_vmm.c

19 files changed, 271 insertions, 420 deletions

diff --git a/usr/src/lib/libdemangle/common/cxx.c b/usr/src/lib/libdemangle/common/cxx.c
index af5f549f78..c89bd2ac7b 100644
--- a/usr/src/lib/libdemangle/common/cxx.c
+++ b/usr/src/lib/libdemangle/common/cxx.c
@@ -167,7 +167,7 @@ size_t cpp_name_max_depth = 1024;	/* max depth of name stack */
 char *
 cpp_demangle(const char *src, size_t srclen, sysdem_ops_t *ops)
 {
-	char *result = NULL;
+	char *volatile result = NULL;
 	cpp_db_t db;
 
 	if (!db_init(&db, ops))
diff --git a/usr/src/uts/i86pc/Makefile.files b/usr/src/uts/i86pc/Makefile.files
index d9d6605a63..6f051c5669 100644
--- a/usr/src/uts/i86pc/Makefile.files
+++ b/usr/src/uts/i86pc/Makefile.files
@@ -117,6 +117,7 @@ CORE_OBJS +=			\
 	pwrnow.o		\
 	seg_vmm.o		\
 	smt.o			\
+	seg_vmm.o		\
 	speedstep.o		\
 	ssp.o			\
 	startup.o		\
diff --git a/usr/src/uts/i86pc/vm/seg_vmm.c b/usr/src/uts/i86pc/vm/seg_vmm.c
index beb5e81d53..faebf9ac36 100644
--- a/usr/src/uts/i86pc/vm/seg_vmm.c
+++ b/usr/src/uts/i86pc/vm/seg_vmm.c
@@ -14,15 +14,12 @@
  */
 
 /*
- * segvmm - Virtual-Machine-Memory segment
+ * VM - Virtual-Machine-Memory segment
  *
  * The vmm segment driver was designed for mapping regions of kernel memory
  * allocated to an HVM instance into userspace for manipulation there.  It
  * draws direct lineage from the umap segment driver, but meant for larger
  * mappings with fewer restrictions.
- *
- * seg*k*vmm, in contrast, has mappings for every VMM into kas.  We use its
- * mappings here only to find the relevant PFNs in segvmm_fault_in().
  */
 
 
@@ -96,7 +93,7 @@ static struct seg_ops segvmm_ops = {
 
 
 /*
- * Create a kernel/user-mapped segment.  ->kaddr is the segkvmm mapping.
+ * Create a kernel/user-mapped segment.
  */
 int
 segvmm_create(struct seg **segpp, void *argsp)
diff --git a/usr/src/uts/sun/io/fd.c b/usr/src/uts/sun/io/fd.c
index 7a760aa8af..e8dcaca3c1 100644
--- a/usr/src/uts/sun/io/fd.c
+++ b/usr/src/uts/sun/io/fd.c
@@ -6553,7 +6553,7 @@ release_sb_dma(struct fdctlr *fdc)
 	dma_reg = (struct sb_dma_reg *)fdc->c_dma_regs;
 	/* Unmask all the channels to release the DMA controller */
 	ddi_put8(fdc->c_handlep_dma,
-	    &dma_reg->sb_dma_regs[DMAC1_ALLMASK], NULL);
+	    &dma_reg->sb_dma_regs[DMAC1_ALLMASK], 0);
 	fdc->sb_dma_lock = 0;
 }
 
diff --git a/usr/src/uts/sun/io/socal.c b/usr/src/uts/sun/io/socal.c
index 084c59f0d5..ad94e101b7 100644
--- a/usr/src/uts/sun/io/socal.c
+++ b/usr/src/uts/sun/io/socal.c
@@ -86,7 +86,7 @@
 #define	SOCAL_DEBUG 0
 #endif
 static uchar_t	socal_xrambuf[0x40000];
-static int 	socal_core = SOCAL_TAKE_CORE;
+static int	socal_core = SOCAL_TAKE_CORE;
 #if SOCAL_DEBUG > 0 && !defined(lint)
 static	int soc_debug = SOCAL_DEBUG;
 static  int socal_read_stale_data = 0;
@@ -224,7 +224,7 @@ static struct ddi_dma_attr socal_dma_attr = {
 	(unsigned long long)0xffffffff,	/* addr_hi */
 	(unsigned long long)0xffffffff,	/* count max */
 	(unsigned long long)4,		/* align */
-	DEFAULT_BURSTSIZE | BURST32 | BURST64, 	/* burst size */
+	DEFAULT_BURSTSIZE | BURST32 | BURST64,	/* burst size */
 	1,				/* minxfer */
 	(unsigned long long)0xffffffff,	/* maxxfer */
 	(unsigned long long)0xffffffff,	/* seg */
@@ -1111,7 +1111,7 @@ socal_dodetach(dev_info_t *dip)
 
 int
 socal_bus_ctl(dev_info_t *dip, dev_info_t *rip, ddi_ctl_enum_t op,
-	void *a, void *v)
+    void *a, void *v)
 {
 	int		port;
 
@@ -1252,12 +1252,12 @@ socal_bus_ctl(dev_info_t *dip, dev_info_t *rip, ddi_ctl_enum_t op,
 /*
  * int
  * socal_getinfo() - Given the device number, return the devinfo
- * 	pointer or the instance number.  Note: this routine must be
- * 	successful on DDI_INFO_DEVT2INSTANCE even before attach.
+ *	pointer or the instance number.  Note: this routine must be
+ *	successful on DDI_INFO_DEVT2INSTANCE even before attach.
  */
 int
 socal_getinfo(dev_info_t *dip, ddi_info_cmd_t cmd, void *arg,
-	void **result)
+    void **result)
 {
 	int instance;
 	socal_state_t *socalp;
@@ -1288,7 +1288,7 @@ socal_getinfo(dev_info_t *dip, ddi_info_cmd_t cmd, void *arg,
 int
 socal_open(dev_t *devp, int flag, int otyp, cred_t *cred_p)
 {
-	int 	instance = getminor(*devp)/2;
+	int	instance = getminor(*devp) / 2;
 	socal_state_t	*socalp =
 	    ddi_get_soft_state(socal_soft_state_p, instance);
 	socal_port_t	*port_statep;
@@ -1312,7 +1312,7 @@ socal_open(dev_t *devp, int flag, int otyp, cred_t *cred_p)
 int
 socal_close(dev_t dev, int flag, int otyp, cred_t *cred_p)
 {
-	int 	instance = getminor(dev)/2;
+	int	instance = getminor(dev) / 2;
 	socal_state_t	*socalp =
 	    ddi_get_soft_state(socal_soft_state_p, instance);
 	socal_port_t	*port_statep;
@@ -1334,15 +1334,15 @@ int
 socal_ioctl(dev_t dev,
     int cmd, intptr_t arg, int mode, cred_t *cred_p, int *rval_p)
 {
-	int 	instance = getminor(dev)/2;
+	int	instance = getminor(dev) / 2;
 	socal_state_t	*socalp =
 	    ddi_get_soft_state(socal_soft_state_p, instance);
 	int		port;
 	socal_port_t	*port_statep;
-	int 		i;
+	int		i;
 	uint_t		r;
 	int		offset;
-	int 		retval = FCAL_SUCCESS;
+	int		retval = FCAL_SUCCESS;
 	la_els_adisc_t		*adisc_pl;
 	la_els_rls_reply_t	*rls_pl;
 	dev_info_t	*dip;
@@ -2612,11 +2612,11 @@ socal_transport(fcal_packet_t *fcalpkt, fcal_sleep_t sleep, int req_q_no)
 /*ARGSUSED*/
 static int
 socal_cq_enque(socal_state_t *socalp, socal_port_t *port_statep, cqe_t *cqe,
-		int rqix, fcal_sleep_t sleep, fcal_packet_t *to_queue,
-		int mtxheld)
+    int rqix, fcal_sleep_t sleep, fcal_packet_t *to_queue,
+    int mtxheld)
 {
 #if defined(DEBUG) && !defined(lint)
-	int 		instance = ddi_get_instance(socalp->dip);
+	int		instance = ddi_get_instance(socalp->dip);
 #endif
 	socal_kcq_t	*kcq;
 	cqe_t		*sp;
@@ -2644,7 +2644,7 @@ socal_cq_enque(socal_state_t *socalp, socal_port_t *port_statep, cqe_t *cqe,
 	if (to_queue) {
 		if ((to_queue->fcal_socal_request.sr_soc_hdr.sh_request_token =
 		    SOCAL_ID_GET(to_queue, mtxheld ? FCAL_NOSLEEP :
-		    sleep)) == NULL) {
+		    sleep)) == 0) {
 			return (FCAL_TRANSPORT_QFULL);
 		}
 	}
@@ -3034,8 +3034,8 @@ socal_abort_cmd(void *ssp, uint_t port, fcal_packet_t *fcalpkt, uint_t polled)
 /*ARGSUSED*/
 static uint_t
 socal_els(void *ssp, uint_t port, uint_t elscode, uint_t dest,
-	void (*callback)(), void *arg, caddr_t reqpl, caddr_t *rsppl,
-	uint_t sleep)
+    void (*callback)(), void *arg, caddr_t reqpl, caddr_t *rsppl,
+    uint_t sleep)
 {
 	return (FCAL_TRANSPORT_FAILURE);
 }
@@ -3068,7 +3068,7 @@ socal_bypass_dev(void *ssp, uint_t port, uint_t dest)
 static void
 socal_force_reset(void *ssp, uint_t port, uint_t restart)
 {
-	socal_state_t 	*socalp = (socal_state_t *)ssp;
+	socal_state_t	*socalp = (socal_state_t *)ssp;
 
 	mutex_enter(&socalp->k_imr_mtx);
 	if (socalp->socal_shutdown) {
@@ -3090,8 +3090,8 @@ socal_force_reset(void *ssp, uint_t port, uint_t restart)
 
 static void
 socal_add_ulp(void *ssp, uint_t port, uchar_t type,
-	void (*ulp_statec_callback)(), void (*ulp_els_callback)(),
-	void (*ulp_data_callback)(), void *arg)
+    void (*ulp_statec_callback)(), void (*ulp_els_callback)(),
+    void (*ulp_data_callback)(), void *arg)
 {
 	socal_state_t	*socalp = (socal_state_t *)ssp;
 	socal_port_t	*port_statep = &socalp->port_state[port];
@@ -4265,13 +4265,13 @@ socal_force_offline(void *ssp, uint_t port, uint_t polled)
 
 static int
 socal_issue_adisc(socal_state_t *socalp, uint32_t port, uint32_t dest,
-	la_els_adisc_t *payload, uint32_t polled)
+    la_els_adisc_t *payload, uint32_t polled)
 {
 	int			retval;
 	la_els_adisc_t		*buf;
 	fcal_packet_t		*fcalpkt;
 	socal_port_t		*port_statep;
-	socal_priv_cmd_t 	*privp;
+	socal_priv_cmd_t	*privp;
 
 	port_statep = &socalp->port_state[port];
 
@@ -4314,7 +4314,7 @@ socal_issue_lbf(socal_state_t *socalp, uint32_t port,
 	int			retval;
 	fcal_packet_t		*fcalpkt;
 	socal_port_t		*port_statep;
-	socal_priv_cmd_t 	*privp;
+	socal_priv_cmd_t	*privp;
 
 	port_statep = &socalp->port_state[port];
 
@@ -4341,13 +4341,13 @@ socal_issue_lbf(socal_state_t *socalp, uint32_t port,
 
 static int
 socal_issue_rls(socal_state_t *socalp, uint32_t port, uint32_t dest,
-	la_els_rls_reply_t *payload, uint32_t polled)
+    la_els_rls_reply_t *payload, uint32_t polled)
 {
 	int	retval;
 	la_els_rls_t		*buf;
 	fcal_packet_t		*fcalpkt;
 	socal_port_t		*port_statep;
-	socal_priv_cmd_t 	*privp;
+	socal_priv_cmd_t	*privp;
 	uint32_t		arg;
 
 	port_statep = &socalp->port_state[port];
@@ -4406,7 +4406,7 @@ socal_issue_rls(socal_state_t *socalp, uint32_t port, uint32_t dest,
 
 fcal_packet_t *
 socal_els_alloc(socal_state_t *socalp, uint32_t port, uint32_t dest,
-	uint32_t cmd_size, uint32_t rsp_size, caddr_t *rprivp, uint32_t polled)
+    uint32_t cmd_size, uint32_t rsp_size, caddr_t *rprivp, uint32_t polled)
 {
 	struct fcal_packet	*fcalpkt;
 	ddi_dma_cookie_t	ccookie;
@@ -4555,8 +4555,8 @@ fail:
 
 fcal_packet_t *
 socal_lbf_alloc(socal_state_t *socalp, uint32_t port,
-	uint32_t cmd_size, uint32_t rsp_size, caddr_t *rprivp,
-	uint32_t polled)
+    uint32_t cmd_size, uint32_t rsp_size, caddr_t *rprivp,
+    uint32_t polled)
 {
 	struct fcal_packet	*fcalpkt;
 	ddi_dma_cookie_t	ccookie;
@@ -4755,7 +4755,7 @@ socal_lbf_free(socal_priv_cmd_t *privp)
 
 static int
 socal_getmap(socal_state_t *socalp, uint32_t port, caddr_t arg,
-	uint32_t polled, int flags)
+    uint32_t polled, int flags)
 {
 	ddi_dma_cookie_t	dcookie;
 	ddi_dma_handle_t	dhandle = NULL;
@@ -4848,7 +4848,9 @@ static	void
 socal_wcopy(uint_t *h_src, uint_t *h_dest, int len)
 {
 	int	i;
-	for (i = 0; i < len/4; i++) {
+
+	len /= 4;
+	for (i = 0; i < len; i++) {
 		*h_dest++ = *h_src++;
 	}
 }
@@ -4981,7 +4983,7 @@ socal_fix_harda(socal_state_t *socalp, int port)
 fcal_transport_t *
 socal_sftm_attach(dev_t dev, int loop_id)
 {
-	int 		instance = getminor(dev) / 2;
+	int		instance = getminor(dev) / 2;
 	int		port = getminor(dev) % 2;
 	int		hard_alpa;
 	char		*name;
diff --git a/usr/src/uts/sun/io/zs_hdlc.c b/usr/src/uts/sun/io/zs_hdlc.c
index 5b9b1d45e2..dc9a0bde3d 100644
--- a/usr/src/uts/sun/io/zs_hdlc.c
+++ b/usr/src/uts/sun/io/zs_hdlc.c
@@ -117,7 +117,7 @@ int zsh_h_log_n[2];
 	}
 
 #define	zsh_h_log_clear \
-	{ register char *p; \
+	{ char *p; \
 	for (p = &zsh_h_log[zs->zs_unit][ZSH_H_LOG_MAX]; \
 		p >= &zsh_h_log[zs->zs_unit][0]; p--) \
 		*p = '\0'; \
@@ -169,8 +169,8 @@ static struct module_info hdlc_minfo = {
 	"zsh",		/* module name */
 	0,		/* minimum packet size accepted */
 	INFPSZ,		/* maximum packet size accepted */
-	12*1024,	/* queue high water mark (bytes) */
-	4*1024		/* queue low water mark (bytes) */
+	12 * 1024,	/* queue high water mark (bytes) */
+	4 * 1024	/* queue low water mark (bytes) */
 };
 
 static struct qinit hdlc_rinit = {
@@ -292,9 +292,9 @@ static int	zsh_setmode(struct zscom *zs, struct syncline *zss,
  */
 #define	ZSH_GETBLOCK(zs, allocbcount) \
 { \
-	register int n = ZSH_MAX_RSTANDBY; \
+	int n = ZSH_MAX_RSTANDBY; \
 	while (--n >= 0) { \
-	    if (!zss->sl_rstandby[n]) { \
+	    if (zss->sl_rstandby[n] == NULL) { \
 		if ((zss->sl_rstandby[n] = \
 		    allocb(zss->sl_mru, BPRI_MED)) == NULL) { \
 		    if (zss->sl_bufcid == 0) { \
@@ -318,7 +318,7 @@ static int	zsh_setmode(struct zscom *zs, struct syncline *zss,
  */
 #define	ZSH_ALLOCB(mp) \
 { \
-	register int n = ZSH_MAX_RSTANDBY; \
+	int n = ZSH_MAX_RSTANDBY; \
 	mp = NULL; \
 	while (--n >= 0)  { \
 		if ((mp = zss->sl_rstandby[n]) != NULL) { \
@@ -330,7 +330,7 @@ static int	zsh_setmode(struct zscom *zs, struct syncline *zss,
 
 #define	ZSH_PUTQ(mp) \
 { \
-	register int wptr, rptr;  \
+	int wptr, rptr;  \
 	wptr = zss->sl_rdone_wptr; \
 	rptr = zss->sl_rdone_rptr; \
 	zss->sl_rdone[wptr] = mp; \
@@ -366,10 +366,10 @@ static int	zsh_setmode(struct zscom *zs, struct syncline *zss,
 
 #define	ZSH_FLUSHQ \
 { \
-	register mblk_t *tmp; \
+	mblk_t *tmp; \
 	for (;;) { \
 		ZSH_GETQ(tmp); \
-		if (!(tmp)) \
+		if (tmp == NULL) \
 			break; \
 		freemsg(tmp); \
 	} \
@@ -386,9 +386,8 @@ zsh_probe(dev_info_t *dev)
 static int
 zsh_attach(dev_info_t *dev, ddi_attach_cmd_t cmd)
 {
-	register int	unit;
-	char		name[3] = {
-		'\0', '\0', '\0' 	};
+	int	unit;
+	char	name[3] = { '\0', '\0', '\0' };
 
 	/*
 	 * Since zsh is a child of the "pseudo" nexus, we can expect the
@@ -406,25 +405,25 @@ zsh_attach(dev_info_t *dev, ddi_attach_cmd_t cmd)
 		return (DDI_FAILURE);	/* only use cpu ports */
 
 	if (ddi_create_minor_node(dev, "zsh", S_IFCHR,
-	    NULL, DDI_PSEUDO, CLONE_DEV) == DDI_FAILURE) {
+	    0, DDI_PSEUDO, CLONE_DEV) == DDI_FAILURE) {
 		ddi_remove_minor_node(dev, NULL);
 		cmn_err(CE_WARN, "zsh clone device creation failed.");
 		return (DDI_FAILURE);
 	}
 
-	for (; unit < maxzsh/2; unit++) {
+	for (; unit < maxzsh / 2; unit++) {
 		zscom[unit].zs_hdlc_dip = dev;
 
 		(void) sprintf(name, "%d", unit);
 		if (ddi_create_minor_node(dev, name, S_IFCHR,
-		    2*unit, DDI_PSEUDO, NULL) == DDI_FAILURE) {
+		    2 * unit, DDI_PSEUDO, 0) == DDI_FAILURE) {
 			ddi_remove_minor_node(dev, NULL);
 			return (DDI_FAILURE);
 		}
 		unit++;
 		(void) sprintf(name, "%d", unit);
 		if (ddi_create_minor_node(dev, name, S_IFCHR,
-		    2*(unit-1)+1, DDI_PSEUDO, NULL) == DDI_FAILURE) {
+		    2 * (unit - 1) + 1, DDI_PSEUDO, 0) == DDI_FAILURE) {
 			ddi_remove_minor_node(dev, NULL);
 			return (DDI_FAILURE);
 		}
@@ -436,11 +435,11 @@ zsh_attach(dev_info_t *dev, ddi_attach_cmd_t cmd)
 /* ARGSUSED */
 int
 zsh_info(dev_info_t *dip, ddi_info_cmd_t infocmd, void *arg,
-void **result)
+    void **result)
 {
-	register dev_t dev = (dev_t)arg;
-	register int unit, error;
-	register struct zscom *zs;
+	dev_t dev = (dev_t)arg;
+	int unit, error;
+	struct zscom *zs;
 
 	if ((unit = UNIT(dev)) >= nzs)
 		return (DDI_FAILURE);
@@ -479,7 +478,7 @@ zsh_detach(dev_info_t *dev, ddi_detach_cmd_t cmd)
 static void
 zsh_init_port(struct zscom *zs, struct syncline *zss)
 {
-	register uchar_t s0;
+	uchar_t s0;
 
 	SCC_WRITE(3, (ZSWR3_RX_ENABLE | ZSWR3_RXCRC_ENABLE | ZSWR3_RX_8));
 	SCC_WRITE(5, (ZSWR5_TX_8 | ZSWR5_DTR | ZSWR5_TXCRC_ENABLE));
@@ -500,7 +499,7 @@ zsh_init_port(struct zscom *zs, struct syncline *zss)
 			zss->sl_txstate = TX_RTS;
 			zss->sl_rr0 &= ~ZSRR0_CTS;
 			zss->sl_wd_count = zsh_timer_count;
-			if (!zss->sl_wd_id)
+			if (zss->sl_wd_id == NULL)
 				zss->sl_wd_id = timeout(zsh_watchdog,
 				    zs, SIO_WATCHDOG_TICK);
 		}
@@ -520,11 +519,11 @@ zsh_init_port(struct zscom *zs, struct syncline *zss)
 static int
 zsh_open(queue_t *rq, dev_t *dev, int flag, int sflag, cred_t *cr)
 {
-	register struct zscom *zs;
-	register struct syncline *zss;
-	register struct ser_str *stp;
-	register int	unit;
-	register int 	tmp;
+	struct zscom *zs;
+	struct syncline *zss;
+	struct ser_str *stp;
+	int	unit;
+	int	tmp;
 
 	if (sflag != CLONEOPEN) {
 		if (rq->q_ptr)
@@ -559,7 +558,7 @@ zsh_open(queue_t *rq, dev_t *dev, int flag, int sflag, cred_t *cr)
 
 		zss = (struct syncline *)&zscom[unit].zs_priv_str;
 		stp = &zss->sl_stream;
-		stp->str_state = NULL;
+		stp->str_state = 0;
 		stp->str_com = (caddr_t)zs;
 
 		zss->sl_xhead = NULL;
@@ -600,7 +599,7 @@ zsh_open(queue_t *rq, dev_t *dev, int flag, int sflag, cred_t *cr)
 	} else {   /* CLONEOPEN */
 		mutex_enter(&zs_curr_lock);
 		for (unit = maxzsh; unit < MAXZSHCLONES; unit++)
-			if (!zsh_usedminor[unit]) {
+			if (zsh_usedminor[unit] == '\0') {
 				zsh_usedminor[unit] = (unsigned char)unit;
 				break;
 			}
@@ -804,7 +803,7 @@ out:
 static int
 zsh_hdp_ok_or_rts_state(struct zscom *zs, struct syncline *zss)
 {
-	register uchar_t s0;
+	uchar_t s0;
 
 	SCC_BIS(15, ZSR15_CTS);
 	SCC_BIS(5, ZSWR5_RTS);
@@ -827,14 +826,14 @@ zsh_hdp_ok_or_rts_state(struct zscom *zs, struct syncline *zss)
 static void
 zsh_wput(queue_t *wq, mblk_t *mp)
 {
-	register struct ser_str *stp = (struct ser_str *)wq->q_ptr;
-	register struct zscom *zs;
-	register struct syncline *zss = NULL;
-	register ulong_t prim, error = 0;
-	register union DL_primitives *dlp;
-	register int	ppa;
-	register mblk_t *tmp;
-	register struct copyresp	*resp;
+	struct ser_str *stp = (struct ser_str *)wq->q_ptr;
+	struct zscom *zs;
+	struct syncline *zss = NULL;
+	ulong_t prim, error = 0;
+	union DL_primitives *dlp;
+	int	ppa;
+	mblk_t *tmp;
+	struct copyresp	*resp;
 
 	/*
 	 * stp->str_com supplied by open or DLPI attach.
@@ -907,7 +906,7 @@ zsh_wput(queue_t *wq, mblk_t *mp)
 			(void) zsh_softint(zs);
 		}
 		while (mp->b_wptr == mp->b_rptr) {
-			register mblk_t *mp1;
+			mblk_t *mp1;
 			mp1 = unlinkb(mp);
 			freemsg(mp);
 			mp = mp1;
@@ -929,7 +928,7 @@ zsh_wput(queue_t *wq, mblk_t *mp)
 		}
 		tmp = NULL;
 again:
-		if (!zss->sl_xstandby) {
+		if (zss->sl_xstandby == NULL) {
 			if (tmp)
 				zss->sl_xstandby = tmp;
 			else {
@@ -955,7 +954,7 @@ again:
 			return;
 		}
 
-		if (!zss->sl_wd_id) {
+		if (zss->sl_wd_id == NULL) {
 			zss->sl_wd_count = zsh_timer_count;
 			zss->sl_txstate = TX_IDLE;
 			mutex_exit(zs->zs_excl_hi);
@@ -1060,7 +1059,7 @@ end_proto:
 			error = zsh_setmode(zs, zss,
 			    (struct scc_mode *)mp->b_cont->b_rptr);
 			if (error) {
-				register struct iocblk  *iocp =
+				struct iocblk  *iocp =
 				    (struct iocblk *)mp->b_rptr;
 				mp->b_datap->db_type = M_IOCNAK;
 				iocp->ioc_error = error;
@@ -1133,10 +1132,10 @@ end_proto:
 static int
 zsh_start(struct zscom *zs, struct syncline *zss)
 {
-	register mblk_t *mp;
-	register uchar_t *wptr;
-	register uchar_t *rptr;
-	register uchar_t sl_flags = zss->sl_flags;
+	mblk_t *mp;
+	uchar_t *wptr;
+	uchar_t *rptr;
+	uchar_t sl_flags = zss->sl_flags;
 
 	/*
 	 * Attempt to grab the next M_DATA message off the queue (that's
@@ -1176,7 +1175,7 @@ zsh_start(struct zscom *zs, struct syncline *zss)
 		if (!(sl_flags & SF_FDXPTP)) {
 			sl_flags |= SF_PHONY;
 			ZSH_ALLOCB(mp);
-			if (!mp)
+			if (mp == NULL)
 				return (0);
 			mp->b_datap->db_type = M_RSE;
 			mp->b_wptr = mp->b_rptr + 1;
@@ -1232,15 +1231,15 @@ transmit:
 static void
 zsh_ioctl(queue_t *wq, mblk_t *mp)
 {
-	register struct ser_str *stp = (struct ser_str *)wq->q_ptr;
-	register struct zscom *zs = (struct zscom *)stp->str_com;
-	register struct syncline *zss  = (struct syncline *)&zs->zs_priv_str;
-	register struct iocblk   *iocp = (struct iocblk *)mp->b_rptr;
-	register struct scc_mode *sm;
-	register struct sl_stats *st;
-	register uchar_t	 *msignals;
-	register mblk_t		 *tmp;
-	register int		 error = 0;
+	struct ser_str *stp = (struct ser_str *)wq->q_ptr;
+	struct zscom *zs = (struct zscom *)stp->str_com;
+	struct syncline *zss  = (struct syncline *)&zs->zs_priv_str;
+	struct iocblk   *iocp = (struct iocblk *)mp->b_rptr;
+	struct scc_mode *sm;
+	struct sl_stats *st;
+	uchar_t	 *msignals;
+	mblk_t		 *tmp;
+	int		 error = 0;
 
 	mutex_enter(zs->zs_excl);
 	if ((zs->zs_ops != &zsops_null) &&
@@ -1389,8 +1388,8 @@ end_zsh_ioctl:
 int
 zsh_setmode(struct zscom *zs, struct syncline *zss, struct scc_mode *sm)
 {
-	register int error = 0;
-	register mblk_t *mp;
+	int error = 0;
+	mblk_t *mp;
 
 	mutex_enter(zs->zs_excl_hi);
 	if (sm->sm_rxclock == RXC_IS_PLL) {
@@ -1450,10 +1449,10 @@ zsh_setmode(struct zscom *zs, struct syncline *zss, struct scc_mode *sm)
 static void
 zsh_txint(struct zscom *zs)
 {
-	register struct syncline *zss;
-	register mblk_t *mp;
-	register int tmp;
-	register uchar_t *wr_cur;
+	struct syncline *zss;
+	mblk_t *mp;
+	int tmp;
+	uchar_t *wr_cur;
 
 	TRACE_1(TR_ZSH, TR_ZSH_TXINT, "zsh_txint: zs = %p", zs);
 
@@ -1480,7 +1479,7 @@ again_txint:
 		if (mp) {
 			zss->sl_xactb = mp;
 			zss->sl_ocnt += tmp = mp->b_wptr - mp->b_rptr;
-			if (!tmp)
+			if (tmp == 0)
 				goto again_txint;
 			zs->zs_wr_cur = mp->b_rptr;
 			zs->zs_wr_lim = mp->b_wptr;
@@ -1563,8 +1562,8 @@ again_txint:
 static void
 zsh_xsint(struct zscom *zs)
 {
-	register struct syncline *zss = (struct syncline *)&zs->zs_priv_str;
-	register uchar_t s0, x0;
+	struct syncline *zss = (struct syncline *)&zs->zs_priv_str;
+	uchar_t s0, x0;
 
 	TRACE_1(TR_ZSH, TR_ZSH_XSINT, "zsh_xsint: zs = %p", zs);
 
@@ -1676,8 +1675,8 @@ zsh_xsint(struct zscom *zs)
 static void
 zsh_rxint(struct zscom *zs)
 {
-	register struct syncline *zss = (struct syncline *)&zs->zs_priv_str;
-	register mblk_t *bp = zss->sl_ractb;
+	struct syncline *zss = (struct syncline *)&zs->zs_priv_str;
+	mblk_t *bp = zss->sl_ractb;
 	unsigned char *rd_cur;
 
 	TRACE_1(TR_ZSH, TR_ZSH_RXINT, "zsh_rxint: zs = %p", zs);
@@ -1688,8 +1687,8 @@ zsh_rxint(struct zscom *zs)
 		return;
 	}
 
-	if (!rd_cur) { /* Beginning of frame */
-		if (!bp) {
+	if (rd_cur == NULL) { /* Beginning of frame */
+		if (bp == NULL) {
 			ZSH_ALLOCB(bp);
 			zss->sl_ractb = bp;
 		}
@@ -1699,7 +1698,7 @@ zsh_rxint(struct zscom *zs)
 		ZSH_ALLOCB(bp->b_cont);
 		bp = zss->sl_ractb = bp->b_cont;
 	}
-	if (!bp) {
+	if (bp == NULL) {
 		zss->sl_st.nobuffers++;
 		zsh_rxbad(zs, zss);
 		return;
@@ -1716,9 +1715,9 @@ zsh_rxint(struct zscom *zs)
 static void
 zsh_srint(struct zscom *zs)
 {
-	register struct syncline *zss = (struct syncline *)&zs->zs_priv_str;
-	register uchar_t s1;
-	register uchar_t *rd_cur;
+	struct syncline *zss = (struct syncline *)&zs->zs_priv_str;
+	uchar_t s1;
+	uchar_t *rd_cur;
 
 	TRACE_1(TR_ZSH, TR_ZSH_SRINT, "zsh_srint: zs = %p", zs);
 
@@ -1768,18 +1767,18 @@ zsh_srint(struct zscom *zs)
 static int
 zsh_softint(struct zscom *zs)
 {
-	register struct syncline *zss;
-	register queue_t *q;
-	register mblk_t *mp, *tmp;
-	register mblk_t *head = NULL, *tail = NULL;
-	register int allocbcount = 0;
+	struct syncline *zss;
+	queue_t *q;
+	mblk_t *mp, *tmp;
+	mblk_t *head = NULL, *tail = NULL;
+	int allocbcount = 0;
 	int m_error;
 
 	TRACE_1(TR_ZSH, TR_ZSH_SOFT_START, "zsh_soft start: zs = %p", zs);
 
 	mutex_enter(zs->zs_excl);
 	zss = (struct syncline *)zs->zs_priv;
-	if (!zss || (q = zss->sl_stream.str_rq) == NULL) {
+	if (zss == NULL || (q = zss->sl_stream.str_rq) == NULL) {
 		mutex_exit(zs->zs_excl);
 		return (0);
 	}
@@ -1788,7 +1787,7 @@ zsh_softint(struct zscom *zs)
 	zss->sl_m_error = 0;
 
 
-	if (!zss->sl_mstat)
+	if (zss->sl_mstat == NULL)
 		zss->sl_mstat = allocb(sizeof (struct sl_status), BPRI_MED);
 
 	mutex_enter(zs->zs_excl_hi);
@@ -1796,7 +1795,7 @@ zsh_softint(struct zscom *zs)
 		if (!(zss->sl_flags & SF_FDXPTP)) {
 			zss->sl_flags &= ~SF_FLUSH_WQ;
 		} else {
-			register uchar_t s0;
+			uchar_t s0;
 
 			s0 = SCC_READ0();
 			if (s0 & ZSRR0_CTS) {
@@ -1817,7 +1816,7 @@ zsh_softint(struct zscom *zs)
 next:
 	for (;;) {
 		ZSH_GETQ(mp);
-		if (!mp)
+		if (mp == NULL)
 			break;
 
 		if (mp->b_rptr == mp->b_wptr) {
@@ -1842,12 +1841,12 @@ next:
 				continue;
 			}
 		}
-		if (!head) {
+		if (head == NULL) {
 			allocbcount++;
 			zss->sl_soft_active = 1;
 			head = mp;
 		} else {
-			if (!tail)
+			if (tail == NULL)
 				tail = head;
 			tail->b_next = mp;
 			tail = mp;
@@ -1859,7 +1858,7 @@ next:
 	tmp = NULL;
 again:
 	mutex_enter(zs->zs_excl_hi);
-	if (!zss->sl_xstandby) {
+	if (zss->sl_xstandby == NULL) {
 		if (tmp) {
 			zss->sl_xstandby = tmp;
 			mutex_exit(zs->zs_excl_hi);
@@ -1877,7 +1876,7 @@ again:
 	mutex_exit(zs->zs_excl);
 
 	while (head) {
-		if (!tail) {
+		if (tail == NULL) {
 			putnext(q, head);
 			break;
 		}
@@ -1905,14 +1904,14 @@ again:
 static int
 zsh_program(struct zscom *zs, struct scc_mode *sm)
 {
-	register struct syncline *zss  = (struct syncline *)&zs->zs_priv_str;
-	register struct zs_prog *zspp;
-	register ushort_t	tconst = 0;
-	register int	wr11 = 0;
-	register int	baud = 0;
-	register int	pll = 0;
-	register int	speed = 0;
-	register int	flags = ZSP_SYNC;
+	struct syncline *zss  = (struct syncline *)&zs->zs_priv_str;
+	struct zs_prog *zspp;
+	ushort_t	tconst = 0;
+	int	wr11 = 0;
+	int	baud = 0;
+	int	pll = 0;
+	int	speed = 0;
+	int	flags = ZSP_SYNC;
 	int		err = 0;
 
 	ZSSETSOFT(zs); /* get our house in order */
@@ -2060,9 +2059,9 @@ out:
 static void
 zsh_setmstat(struct zscom *zs, int event)
 {
-	register struct syncline *zss = (struct syncline *)&zs->zs_priv_str;
-	register struct sl_status *mstat;
-	register mblk_t *mp;
+	struct syncline *zss = (struct syncline *)&zs->zs_priv_str;
+	struct sl_status *mstat;
+	mblk_t *mp;
 
 	if (((mp = zss->sl_mstat) != NULL) &&
 	    (zss->sl_mode.sm_config & (CONN_SIGNAL))) {
diff --git a/usr/src/uts/sun4/io/pcicfg.c b/usr/src/uts/sun4/io/pcicfg.c
index b1bb75ab1c..e2f2e42d59 100644
--- a/usr/src/uts/sun4/io/pcicfg.c
+++ b/usr/src/uts/sun4/io/pcicfg.c
@@ -577,24 +577,24 @@ pcicfg_get_nslots(dev_info_t *dip, ddi_acc_handle_t handle)
 	    &cap_ptr)) == DDI_SUCCESS) {
 		uint32_t config;
 
-		PCI_CAP_PUT8(handle, NULL, cap_ptr, PCI_HP_DWORD_SELECT_OFF,
+		PCI_CAP_PUT8(handle, 0, cap_ptr, PCI_HP_DWORD_SELECT_OFF,
 		    PCI_HP_SLOT_CONFIGURATION_REG);
-		config = PCI_CAP_GET32(handle, NULL, cap_ptr,
+		config = PCI_CAP_GET32(handle, 0, cap_ptr,
 		    PCI_HP_DWORD_DATA_OFF);
 		num_slots = config & 0x1F;
 	} else if ((PCI_CAP_LOCATE(handle, PCI_CAP_ID_SLOT_ID, &cap_ptr))
 	    == DDI_SUCCESS) {
-		uint8_t esr_reg = PCI_CAP_GET8(handle, NULL,
+		uint8_t esr_reg = PCI_CAP_GET8(handle, 0,
 		    cap_ptr, PCI_CAP_ID_REGS_OFF);
 
 		num_slots = PCI_CAPSLOT_NSLOTS(esr_reg);
 	} else if ((PCI_CAP_LOCATE(handle, PCI_CAP_ID_PCI_E, &cap_ptr))
 	    == DDI_SUCCESS) {
-		int port_type = PCI_CAP_GET16(handle, NULL, cap_ptr,
+		int port_type = PCI_CAP_GET16(handle, 0, cap_ptr,
 		    PCIE_PCIECAP) & PCIE_PCIECAP_DEV_TYPE_MASK;
 
 		if ((port_type == PCIE_PCIECAP_DEV_TYPE_DOWN) &&
-		    (PCI_CAP_GET16(handle, NULL, cap_ptr, PCIE_PCIECAP)
+		    (PCI_CAP_GET16(handle, 0, cap_ptr, PCIE_PCIECAP)
 		    & PCIE_PCIECAP_SLOT_IMPL))
 				num_slots = 1;
 	}
@@ -614,7 +614,7 @@ pcicfg_is_chassis(dev_info_t *dip, ddi_acc_handle_t handle)
 	if ((PCI_CAP_LOCATE(handle, PCI_CAP_ID_SLOT_ID, &cap_ptr)) !=
 	    DDI_FAILURE) {
 
-		uint8_t esr_reg = PCI_CAP_GET8(handle, NULL, cap_ptr, 2);
+		uint8_t esr_reg = PCI_CAP_GET8(handle, 0, cap_ptr, 2);
 		if (PCI_CAPSLOT_FIC(esr_reg))
 			return (B_TRUE);
 	}
@@ -665,7 +665,7 @@ pcicfg_pcie_port_type(dev_info_t *dip, ddi_acc_handle_t handle)
 
 	if ((PCI_CAP_LOCATE(handle, PCI_CAP_ID_PCI_E, &cap_ptr)) !=
 	    DDI_FAILURE)
-		port_type = PCI_CAP_GET16(handle, NULL,
+		port_type = PCI_CAP_GET16(handle, 0,
 		    cap_ptr, PCIE_PCIECAP) & PCIE_PCIECAP_DEV_TYPE_MASK;
 
 	return (port_type);
@@ -3535,11 +3535,11 @@ pcicfg_set_standard_props(dev_info_t *dip, ddi_acc_handle_t config_handle,
 	ret = PCI_CAP_LOCATE(config_handle, PCI_CAP_ID_PCI_E, &cap_ptr);
 
 	if (pcie_dev && (ret == DDI_SUCCESS)) {
-		val = PCI_CAP_GET16(config_handle, NULL, cap_ptr,
+		val = PCI_CAP_GET16(config_handle, 0, cap_ptr,
 		    PCIE_PCIECAP) & PCIE_PCIECAP_SLOT_IMPL;
 		/* if slot implemented, get physical slot number */
 		if (val) {
-			wordval = (PCI_CAP_GET32(config_handle, NULL,
+			wordval = (PCI_CAP_GET32(config_handle, 0,
 			    cap_ptr, PCIE_SLOTCAP) >>
 			    PCIE_SLOTCAP_PHY_SLOT_NUM_SHIFT) &
 			    PCIE_SLOTCAP_PHY_SLOT_NUM_MASK;
@@ -3977,13 +3977,13 @@ pcicfg_disable_bridge_probe_err(dev_info_t *dip, ddi_acc_handle_t h,
 			return;
 
 		regs->pcie_cap_off = cap_ptr;
-		regs->devctl = devctl = PCI_CAP_GET16(h, NULL, cap_ptr,
+		regs->devctl = devctl = PCI_CAP_GET16(h, 0, cap_ptr,
 		    PCIE_DEVCTL);
 		devctl &= ~(PCIE_DEVCTL_UR_REPORTING_EN |
 		    PCIE_DEVCTL_CE_REPORTING_EN |
 		    PCIE_DEVCTL_NFE_REPORTING_EN |
 		    PCIE_DEVCTL_FE_REPORTING_EN);
-		PCI_CAP_PUT16(h, NULL, cap_ptr, PCIE_DEVCTL, devctl);
+		PCI_CAP_PUT16(h, 0, cap_ptr, PCIE_DEVCTL, devctl);
 	}
 }
 
@@ -4635,7 +4635,7 @@ pcicfg_fcode_probe(dev_info_t *parent, uint_t bus, uint_t device,
 			 * the status property if it exists.
 			 */
 			if (ddi_prop_lookup_string(DDI_DEV_T_ANY,
-			    new_child, NULL, "status", &status_prop) ==
+			    new_child, 0, "status", &status_prop) ==
 			    DDI_PROP_SUCCESS) {
 				if ((strncmp("disabled", status_prop, 8) ==
 				    0) || (strncmp("fail", status_prop, 4) ==
diff --git a/usr/src/uts/sun4u/adm1031/Makefile b/usr/src/uts/sun4u/adm1031/Makefile
index 119e16ed93..f403a139ab 100644
--- a/usr/src/uts/sun4u/adm1031/Makefile
+++ b/usr/src/uts/sun4u/adm1031/Makefile
@@ -22,8 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 #	This makefile drives the adm1031 build.
 #
 #	Path to the base of the uts directory tree (usually /usr/src/uts).
@@ -35,7 +33,6 @@ UTSBASE	= ../..
 #
 MODULE		= adm1031
 OBJECTS		= $(ADM1031_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(ADM1031_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 
 #
@@ -43,25 +40,12 @@ ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 #
 include $(UTSBASE)/sun4u/Makefile.sun4u
 
-# 
-# lint pass one enforcement 
-# 
-CFLAGS += $(CCVERBOSE)
-
 LDFLAGS += -dy -N misc/i2c_svc
 
 #
-# For now, disable these lint checks; maintainers should endeavor
-# to investigate and remove these for maximum lint coverage.
-# Please do not carry these forward to new Makefiles.
-#
-LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
-
-#
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 .KEEP_STATE:
@@ -74,12 +58,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS)
 
 #
diff --git a/usr/src/uts/sun4u/io/i2c/clients/adm1031.c b/usr/src/uts/sun4u/io/i2c/clients/adm1031.c
index 4f96fb123c..cdd3be260d 100644
--- a/usr/src/uts/sun4u/io/i2c/clients/adm1031.c
+++ b/usr/src/uts/sun4u/io/i2c/clients/adm1031.c
@@ -46,10 +46,10 @@
 /*
  * ADM1031 is an Intelligent Temperature Monitor and Dual PWM Fan Controller.
  * The functions supported by the driver are:
- * 	Reading sensed temperatures.
- * 	Setting temperature limits which control fan speeds.
- * 	Reading fan speeds.
- * 	Setting fan outputs.
+ *	Reading sensed temperatures.
+ *	Setting temperature limits which control fan speeds.
+ *	Reading fan speeds.
+ *	Setting fan outputs.
  *	Reading internal registers.
  *	Setting internal registers.
  */
@@ -210,9 +210,9 @@ _info(struct modinfo *modinfop)
 static int
 adm1031_resume(dev_info_t *dip)
 {
-	int 		instance = ddi_get_instance(dip);
+	int		instance = ddi_get_instance(dip);
 	adm1031_unit_t	*admp;
-	int 		err = DDI_SUCCESS;
+	int		err = DDI_SUCCESS;
 
 	admp = (adm1031_unit_t *)
 	    ddi_get_soft_state(adm1031_soft_statep, instance);
@@ -272,8 +272,8 @@ done:
 static void
 adm1031_detach(dev_info_t *dip)
 {
-	adm1031_unit_t 	*admp;
-	int 		instance = ddi_get_instance(dip);
+	adm1031_unit_t	*admp;
+	int		instance = ddi_get_instance(dip);
 
 	admp = ddi_get_soft_state(adm1031_soft_statep, instance);
 
@@ -317,10 +317,10 @@ adm1031_intr(caddr_t arg)
 static int
 adm1031_attach(dev_info_t *dip)
 {
-	adm1031_unit_t 		*admp;
-	int 			instance = ddi_get_instance(dip);
-	minor_t 		minor;
-	int 			i;
+	adm1031_unit_t		*admp;
+	int			instance = ddi_get_instance(dip);
+	minor_t			minor;
+	int			i;
 	char			*minor_name;
 	int			err = 0;
 
@@ -351,7 +351,7 @@ adm1031_attach(dev_info_t *dip)
 		    ADM1031_FCNINST_TO_MINOR(i);
 
 		if (ddi_create_minor_node(dip, minor_name, S_IFCHR, minor,
-		    ADM1031_NODE_TYPE, NULL) == DDI_FAILURE) {
+		    ADM1031_NODE_TYPE, 0) == DDI_FAILURE) {
 			cmn_err(CE_WARN, "%s:%d ddi_create_minor_node failed",
 			    admp->adm1031_name, instance);
 			adm1031_detach(dip);
@@ -370,7 +370,7 @@ adm1031_attach(dev_info_t *dip)
 		    ADM1031_FCNINST_TO_MINOR(i);
 
 		if (ddi_create_minor_node(dip, minor_name, S_IFCHR, minor,
-		    ADM1031_NODE_TYPE, NULL) == DDI_FAILURE) {
+		    ADM1031_NODE_TYPE, 0) == DDI_FAILURE) {
 			cmn_err(CE_WARN, "%s:%d ddi_create_minor_node failed",
 			    admp->adm1031_name, instance);
 			adm1031_detach(dip);
@@ -386,7 +386,7 @@ adm1031_attach(dev_info_t *dip)
 	    ADM1031_FCNINST_TO_MINOR(0);
 
 	if (ddi_create_minor_node(dip, "control", S_IFCHR, minor,
-	    ADM1031_NODE_TYPE, NULL) == DDI_FAILURE) {
+	    ADM1031_NODE_TYPE, 0) == DDI_FAILURE) {
 		cmn_err(CE_WARN, "%s:%d ddi_create_minor_node failed",
 		    admp->adm1031_name, instance);
 		adm1031_detach(dip);
@@ -459,8 +459,8 @@ adm1031_s_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)
 static int
 adm1031_suspend(dev_info_t *dip)
 {
-	adm1031_unit_t 	*admp;
-	int 		instance = ddi_get_instance(dip);
+	adm1031_unit_t	*admp;
+	int		instance = ddi_get_instance(dip);
 	int		err = DDI_SUCCESS;
 
 	admp = ddi_get_soft_state(adm1031_soft_statep, instance);
@@ -586,7 +586,7 @@ static int
 adm1031_close(dev_t dev, int flags, int otyp, cred_t *credp)
 {
 	int		instance;
-	adm1031_unit_t 	*admp;
+	adm1031_unit_t	*admp;
 
 	_NOTE(ARGUNUSED(flags, otyp, credp))
 
@@ -874,7 +874,7 @@ done:
  * Step 3):
  *	User reads the contents of the array (which actually contains the values
  *	of the devices' status registers) to determine the exact nature of the
- * 	event.
+ *	event.
  */
 static int
 adm1031_i_ioctl(dev_t dev, int cmd, intptr_t arg, int mode)
@@ -1060,12 +1060,11 @@ err:
 
 static int
 adm1031_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp,
-	int *rvalp)
+    int *rvalp)
 {
 	_NOTE(ARGUNUSED(credp, rvalp))
 
 	if (cmd == ADM1031_INTERRUPT_WAIT) {
-
 		return (adm1031_i_ioctl(dev, cmd, arg, mode));
 	} else {
 		return (adm1031_s_ioctl(dev, cmd, arg, mode));
diff --git a/usr/src/uts/sun4u/io/i2c/clients/lm75.c b/usr/src/uts/sun4u/io/i2c/clients/lm75.c
index c5f94eac09..dcc8372e42 100644
--- a/usr/src/uts/sun4u/io/i2c/clients/lm75.c
+++ b/usr/src/uts/sun4u/io/i2c/clients/lm75.c
@@ -217,18 +217,18 @@ lm75_close(dev_t dev, int flags, int otyp, cred_t *credp)
 }
 
 static int
-lm75_get16(intptr_t arg, int reg, struct lm75_unit *unitp, int mode) {
+lm75_get16(intptr_t arg, int reg, struct lm75_unit *unitp, int mode)
+{
 	i2c_transfer_t		*i2c_tran_pointer;
 	int err = DDI_SUCCESS;
 	int16_t			temp16;
 	int8_t			holder;
 
 	(void) i2c_transfer_alloc(unitp->lm75_hdl, &i2c_tran_pointer,
-				1, 2, I2C_SLEEP);
+	    1, 2, I2C_SLEEP);
 	if (i2c_tran_pointer == NULL) {
 		D2CMN_ERR((CE_WARN, "%s: Failed in I2C_GET_TEMPERATURE "
-				"i2c_tran_pointer not allocated\n",
-				unitp->lm75_name));
+		    "i2c_tran_pointer not allocated\n", unitp->lm75_name));
 		return (ENOMEM);
 	}
 
@@ -238,15 +238,14 @@ lm75_get16(intptr_t arg, int reg, struct lm75_unit *unitp, int mode) {
 	err = i2c_transfer(unitp->lm75_hdl, i2c_tran_pointer);
 	if (err) {
 		D2CMN_ERR((CE_WARN, "%s: Failed in I2C_GET_TEMPERATURE "
-				"i2c_transfer routine\n",
-				unitp->lm75_name));
+		    "i2c_transfer routine\n", unitp->lm75_name));
 		i2c_transfer_free(unitp->lm75_hdl, i2c_tran_pointer);
 		return (err);
 	}
 
 	D1CMN_ERR((CE_NOTE, "%s: rbuf[0] =  %x rbuf[1] = %x\n",
-		unitp->lm75_name, i2c_tran_pointer->i2c_rbuf[0],
-		i2c_tran_pointer->i2c_rbuf[0]));
+	    unitp->lm75_name, i2c_tran_pointer->i2c_rbuf[0],
+	    i2c_tran_pointer->i2c_rbuf[0]));
 	temp16 = i2c_tran_pointer->i2c_rbuf[0];
 	temp16 = (temp16 << 1);
 	temp16 = (temp16 | ((i2c_tran_pointer->i2c_rbuf[1] & 0x80) >> 7));
@@ -261,10 +260,9 @@ lm75_get16(intptr_t arg, int reg, struct lm75_unit *unitp, int mode) {
 		temp16 = temp16 / 2;
 	}
 	if (ddi_copyout((caddr_t)&temp16, (caddr_t)arg,
-			sizeof (int16_t), mode) != DDI_SUCCESS) {
+	    sizeof (int16_t), mode) != DDI_SUCCESS) {
 		D2CMN_ERR((CE_WARN, "%s: Failed in I2C_GET_TEMPERATURE "
-				"ddi_copyout routine\n",
-				unitp->lm75_name));
+		    "ddi_copyout routine\n", unitp->lm75_name));
 		err = EFAULT;
 	}
 	i2c_transfer_free(unitp->lm75_hdl, i2c_tran_pointer);
@@ -272,25 +270,24 @@ lm75_get16(intptr_t arg, int reg, struct lm75_unit *unitp, int mode) {
 }
 
 static int
-lm75_set16(intptr_t arg, int reg, struct lm75_unit *unitp, int mode) {
+lm75_set16(intptr_t arg, int reg, struct lm75_unit *unitp, int mode)
+{
 	i2c_transfer_t		*i2c_tran_pointer;
 	int err = DDI_SUCCESS;
 	int16_t			temp16;
 
 	if (ddi_copyin((caddr_t)arg, (caddr_t)&temp16,
-			sizeof (int16_t), mode) != DDI_SUCCESS) {
+	    sizeof (int16_t), mode) != DDI_SUCCESS) {
 		D2CMN_ERR((CE_WARN, "%s: Failed in LM74_SET_HYST "
-				"ddi_copyin routine\n",
-				unitp->lm75_name));
+		    "ddi_copyin routine\n", unitp->lm75_name));
 		return (EFAULT);
 	}
 
 	(void) i2c_transfer_alloc(unitp->lm75_hdl, &i2c_tran_pointer,
-				3, 0, I2C_SLEEP);
+	    3, 0, I2C_SLEEP);
 	if (i2c_tran_pointer == NULL) {
 		D2CMN_ERR((CE_WARN, "%s: Failed in LM75_SET_HYST "
-				"i2c_tran_pointer not allocated\n",
-				unitp->lm75_name));
+		    "i2c_tran_pointer not allocated\n", unitp->lm75_name));
 		return (ENOMEM);
 	}
 
@@ -316,7 +313,7 @@ lm75_set16(intptr_t arg, int reg, struct lm75_unit *unitp, int mode) {
 
 static int
 lm75_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp,
-		int *rvalp)
+    int *rvalp)
 {
 	_NOTE(ARGUNUSED(credp, rvalp))
 
@@ -326,7 +323,7 @@ lm75_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp,
 	i2c_transfer_t		*i2c_tran_pointer;
 	uchar_t			passin_byte;
 
-	if (arg == NULL) {
+	if (arg == (intptr_t)NULL) {
 		D2CMN_ERR((CE_WARN, "LM75: ioctl: arg passed in to ioctl "
 		    "= NULL\n"));
 		err = EINVAL;
@@ -484,7 +481,7 @@ lm75_do_attach(dev_info_t *dip)
 	    "%s%d", ddi_node_name(dip), instance);
 
 	if (ddi_create_minor_node(dip, "lm75", S_IFCHR, instance,
-	    "ddi_i2c:temperature_sensor", NULL) == DDI_FAILURE) {
+	    "ddi_i2c:temperature_sensor", 0) == DDI_FAILURE) {
 		cmn_err(CE_WARN, "%s ddi_create_minor_node failed for "
 		    "%s\n", unitp->lm75_name, "lm75");
 		ddi_soft_state_free(lm75soft_statep, instance);
diff --git a/usr/src/uts/sun4u/io/i2c/clients/pcf8574.c b/usr/src/uts/sun4u/io/i2c/clients/pcf8574.c
index 98f01fb3dd..dfb0cc9f66 100644
--- a/usr/src/uts/sun4u/io/i2c/clients/pcf8574.c
+++ b/usr/src/uts/sun4u/io/i2c/clients/pcf8574.c
@@ -218,18 +218,19 @@ pcf8574_close(dev_t dev, int flags, int otyp, cred_t *credp)
 }
 
 static int
-pcf8574_get(struct pcf8574_unit *unitp, uchar_t *byte) {
+pcf8574_get(struct pcf8574_unit *unitp, uchar_t *byte)
+{
 	i2c_transfer_t		*i2c_tran_pointer;
 	int			err = I2C_SUCCESS;
 
 	D1CMN_ERR((CE_WARN, "Entered the pcf8574_get routine\n"));
 
 	(void) i2c_transfer_alloc(unitp->pcf8574_hdl, &i2c_tran_pointer,
-					0, 1, I2C_SLEEP);
+	    0, 1, I2C_SLEEP);
 	if (i2c_tran_pointer == NULL) {
 		D2CMN_ERR((CE_WARN, "%s: Failed in pcf8574_get "
-				"i2c_tran_pointer not allocated\n",
-				unitp->pcf8574_name));
+		    "i2c_tran_pointer not allocated\n",
+		    unitp->pcf8574_name));
 		return (ENOMEM);
 	}
 
@@ -237,13 +238,13 @@ pcf8574_get(struct pcf8574_unit *unitp, uchar_t *byte) {
 	err = i2c_transfer(unitp->pcf8574_hdl, i2c_tran_pointer);
 	if (err) {
 		D2CMN_ERR((CE_WARN, "%s: Failed in the i2c_transfer routine\n",
-				unitp->pcf8574_name));
+		    unitp->pcf8574_name));
 		i2c_transfer_free(unitp->pcf8574_hdl, i2c_tran_pointer);
 		return (err);
 	}
 
 	D1CMN_ERR((CE_WARN, "Back from a transfer value is %x\n",
-		i2c_tran_pointer->i2c_rbuf[0]));
+	    i2c_tran_pointer->i2c_rbuf[0]));
 	*byte = i2c_tran_pointer->i2c_rbuf[0];
 
 	i2c_transfer_free(unitp->pcf8574_hdl, i2c_tran_pointer);
@@ -251,29 +252,30 @@ pcf8574_get(struct pcf8574_unit *unitp, uchar_t *byte) {
 }
 
 static int
-pcf8574_set(struct pcf8574_unit *unitp, uchar_t byte) {
+pcf8574_set(struct pcf8574_unit *unitp, uchar_t byte)
+{
 	i2c_transfer_t		*i2c_tran_pointer;
 	int			err = I2C_SUCCESS;
 
 	(void) i2c_transfer_alloc(unitp->pcf8574_hdl, &i2c_tran_pointer,
-				1, 0, I2C_SLEEP);
+	    1, 0, I2C_SLEEP);
 	if (i2c_tran_pointer == NULL) {
 		D2CMN_ERR((CE_WARN, "%s: Failed in pcf8574_set "
-				"i2c_tran_pointer not allocated\n",
-				unitp->pcf8574_name));
+		    "i2c_tran_pointer not allocated\n",
+		    unitp->pcf8574_name));
 		return (ENOMEM);
 	}
 
 	i2c_tran_pointer->i2c_flags = I2C_WR;
 	i2c_tran_pointer->i2c_wbuf[0] = byte;
 	D1CMN_ERR((CE_NOTE, "%s: contains %x\n", unitp->pcf8574_name,
-			i2c_tran_pointer->i2c_wbuf[0]));
+	    i2c_tran_pointer->i2c_wbuf[0]));
 
 	err = i2c_transfer(unitp->pcf8574_hdl, i2c_tran_pointer);
 	if (err) {
 		D2CMN_ERR((CE_WARN, "%s: Failed in the pcf8574_set"
-				" i2c_transfer routine\n",
-				unitp->pcf8574_name));
+		    " i2c_transfer routine\n",
+		    unitp->pcf8574_name));
 		i2c_transfer_free(unitp->pcf8574_hdl, i2c_tran_pointer);
 		return (err);
 	}
@@ -283,7 +285,7 @@ pcf8574_set(struct pcf8574_unit *unitp, uchar_t byte) {
 
 static int
 pcf8574_ioctl(dev_t dev, int cmd, intptr_t arg, int mode,
-		cred_t *credp, int *rvalp)
+    cred_t *credp, int *rvalp)
 {
 	_NOTE(ARGUNUSED(credp, rvalp))
 
@@ -294,7 +296,7 @@ pcf8574_ioctl(dev_t dev, int cmd, intptr_t arg, int mode,
 	i2c_port_t		ioctl_port;
 	uchar_t			byte;
 
-	if (arg == NULL) {
+	if (arg == (intptr_t)NULL) {
 		D2CMN_ERR((CE_WARN, "PCF8574: ioctl: arg passed in to ioctl "
 		    "= NULL\n"));
 		err = EINVAL;
@@ -509,7 +511,7 @@ pcf8574_do_attach(dev_info_t *dip)
 
 
 	if (ddi_create_minor_node(dip, "pcf8574", S_IFCHR, instance,
-	    "ddi_i2c:ioexp", NULL) == DDI_FAILURE) {
+	    "ddi_i2c:ioexp", 0) == DDI_FAILURE) {
 		cmn_err(CE_WARN, "%s ddi_create_minor_node failed for "
 		    "%s\n", unitp->pcf8574_name, "pcf8574");
 		ddi_soft_state_free(pcf8574soft_statep, instance);
diff --git a/usr/src/uts/sun4u/io/mach_rootnex.c b/usr/src/uts/sun4u/io/mach_rootnex.c
index b2a7ca8f1d..1e3155bba9 100644
--- a/usr/src/uts/sun4u/io/mach_rootnex.c
+++ b/usr/src/uts/sun4u/io/mach_rootnex.c
@@ -105,7 +105,7 @@ rootnex_add_intr_impl(dev_info_t *dip, dev_info_t *rdip,
 	 * Hack to support the UPA slave devices before the 1275
 	 * support for imap was introduced.
 	 */
-	if (ddi_getproplen(DDI_DEV_T_ANY, dip, NULL, "interrupt-map",
+	if (ddi_getproplen(DDI_DEV_T_ANY, dip, 0, "interrupt-map",
 	    &len) != DDI_PROP_SUCCESS && ddi_getprop(DDI_DEV_T_ANY,
 	    rdip, DDI_PROP_DONTPASS, "upa-interrupt-slave", 0) != 0 &&
 	    ddi_get_parent(rdip) == dip) {
@@ -176,7 +176,7 @@ rootnex_remove_intr_impl(dev_info_t *dip, dev_info_t *rdip,
 	 * Hack to support the UPA slave devices before the 1275
 	 * support for imap was introduced.
 	 */
-	if (ddi_getproplen(DDI_DEV_T_ANY, dip, NULL, "interrupt-map",
+	if (ddi_getproplen(DDI_DEV_T_ANY, dip, 0, "interrupt-map",
 	    &len) != DDI_PROP_SUCCESS && ddi_getprop(DDI_DEV_T_ANY,
 	    rdip, DDI_PROP_DONTPASS, "upa-interrupt-slave", 0) != 0) {
 		int32_t r_upaid = -1;
diff --git a/usr/src/uts/sun4u/io/pci/pcipsy.c b/usr/src/uts/sun4u/io/pci/pcipsy.c
index 06a4a71e06..c081d46f3b 100644
--- a/usr/src/uts/sun4u/io/pci/pcipsy.c
+++ b/usr/src/uts/sun4u/io/pci/pcipsy.c
@@ -141,7 +141,7 @@ done:
 	mutex_exit(&pci_global_mutex);
 	if (ret != DDI_SUCCESS)
 		cmn_err(CE_NOTE, "Interrupt register failure, returning 0x%x\n",
-			ret);
+		    ret);
 	return (ret);
 }
 
@@ -244,10 +244,10 @@ pci_intr_setup(pci_t *pci_p)
 	 * Get the interrupts property.
 	 */
 	if (ddi_getlongprop(DDI_DEV_T_ANY, dip, DDI_PROP_DONTPASS,
-		"interrupts", (caddr_t)&pci_p->pci_inos,
-		&pci_p->pci_inos_len) != DDI_SUCCESS)
+	    "interrupts", (caddr_t)&pci_p->pci_inos,
+	    &pci_p->pci_inos_len) != DDI_SUCCESS)
 		cmn_err(CE_PANIC, "%s%d: no interrupts property\n",
-			ddi_driver_name(dip), ddi_get_instance(dip));
+		    ddi_driver_name(dip), ddi_get_instance(dip));
 
 	/*
 	 * figure out number of interrupts in the "interrupts" property
@@ -322,7 +322,7 @@ map_pci_registers(pci_t *pci_p, dev_info_t *dip)
 	if (ddi_regs_map_setup(dip, 0, &pci_p->pci_address[0], 0, 0,
 	    &attr, &pci_p->pci_ac[0]) != DDI_SUCCESS) {
 		cmn_err(CE_WARN, "%s%d: unable to map reg entry 0\n",
-			ddi_driver_name(dip), ddi_get_instance(dip));
+		    ddi_driver_name(dip), ddi_get_instance(dip));
 		return (DDI_FAILURE);
 	}
 	/*
@@ -333,7 +333,7 @@ map_pci_registers(pci_t *pci_p, dev_info_t *dip)
 	    ddi_regs_map_setup(dip, 2, &pci_p->pci_address[2], 0, 0,
 	    &attr, &pci_p->pci_ac[2]) != DDI_SUCCESS) {
 		cmn_err(CE_WARN, "%s%d: unable to map reg entry 2\n",
-			ddi_driver_name(dip), ddi_get_instance(dip));
+		    ddi_driver_name(dip), ddi_get_instance(dip));
 		ddi_regs_map_free(&pci_p->pci_ac[0]);
 		return (DDI_FAILURE);
 	}
@@ -348,7 +348,7 @@ map_pci_registers(pci_t *pci_p, dev_info_t *dip)
 	    PCI_CONF_HDR_SIZE, &attr, &pci_p->pci_ac[1]) != DDI_SUCCESS) {
 
 		cmn_err(CE_WARN, "%s%d: unable to map reg entry 1\n",
-			ddi_driver_name(dip), ddi_get_instance(dip));
+		    ddi_driver_name(dip), ddi_get_instance(dip));
 		ddi_regs_map_free(&pci_p->pci_ac[0]);
 		if (pci_stream_buf_exists)
 			ddi_regs_map_free(&pci_p->pci_ac[2]);
@@ -484,7 +484,7 @@ pci_ib_setup(ib_t *ib_p)
 	ib_p->ib_slot_intr_map_regs = a + PSYCHO_IB_SLOT_INTR_MAP_REG_OFFSET;
 	ib_p->ib_obio_intr_map_regs = a + PSYCHO_IB_OBIO_INTR_MAP_REG_OFFSET;
 	ib_p->ib_obio_clear_intr_regs =
-		a + PSYCHO_IB_OBIO_CLEAR_INTR_REG_OFFSET;
+	    a + PSYCHO_IB_OBIO_CLEAR_INTR_REG_OFFSET;
 	return (a);
 }
 
@@ -498,7 +498,7 @@ pci_xlate_intr(dev_info_t *dip, dev_info_t *rdip, ib_t *ib_p, uint32_t intr)
 
 	if ((intr > PCI_INTD) || (intr < PCI_INTA))
 		goto done;
-	if (ddi_prop_exists(DDI_DEV_T_ANY, rdip, NULL, "interrupt-map"))
+	if (ddi_prop_exists(DDI_DEV_T_ANY, rdip, 0, "interrupt-map"))
 		goto done;
 	/*
 	 * Hack for pre 1275 imap machines e.g. quark & tazmo
@@ -507,7 +507,7 @@ pci_xlate_intr(dev_info_t *dip, dev_info_t *rdip, ib_t *ib_p, uint32_t intr)
 	 */
 	cdip = get_my_childs_dip(dip, rdip);
 	if (ddi_getlongprop(DDI_DEV_T_ANY, cdip, DDI_PROP_DONTPASS, "reg",
-		(caddr_t)&pci_rp, &len) != DDI_SUCCESS)
+	    (caddr_t)&pci_rp, &len) != DDI_SUCCESS)
 		return (0);
 	phys_hi = pci_rp->pci_phys_hi;
 	kmem_free(pci_rp, len);
@@ -525,7 +525,7 @@ pci_xlate_intr(dev_info_t *dip, dev_info_t *rdip, ib_t *ib_p, uint32_t intr)
 	 * if pci bus number > 0x80, then devices are located on the A side(66)
 	 */
 	DEBUG3(DBG_IB, dip, "pci_xlate_intr: bus=%x, dev=%x, intr=%x\n",
-		bus, dev, intr);
+	    bus, dev, intr);
 	intr--;
 	intr |= (bus & 0x80) ? ((dev - 1) << 2) : (0x10 | ((dev - 2) << 2));
 
@@ -748,7 +748,7 @@ cb_ino_to_clr_pa(cb_t *cb_p, ib_ino_t ino)
  */
 int
 cb_remove_xintr(pci_t *pci_p, dev_info_t *dip, dev_info_t *rdip,
-	ib_ino_t ino, ib_mondo_t mondo)
+    ib_ino_t ino, ib_mondo_t mondo)
 {
 	if (ino != pci_p->pci_inos[CBNINTR_THERMAL])
 		return (DDI_FAILURE);
@@ -879,19 +879,19 @@ pbm_configure(pbm_t *pbm_p)
 	 * Clear any PBM errors.
 	 */
 	l = (PSYCHO_PCI_AFSR_E_MASK << PSYCHO_PCI_AFSR_PE_SHIFT) |
-		(PSYCHO_PCI_AFSR_E_MASK << PSYCHO_PCI_AFSR_SE_SHIFT);
+	    (PSYCHO_PCI_AFSR_E_MASK << PSYCHO_PCI_AFSR_SE_SHIFT);
 	*pbm_p->pbm_async_flt_status_reg = l;
 
 	/*
 	 * Clear error bits in configuration status register.
 	 */
 	s = PCI_STAT_PERROR | PCI_STAT_S_PERROR |
-		PCI_STAT_R_MAST_AB | PCI_STAT_R_TARG_AB |
-		PCI_STAT_S_TARG_AB | PCI_STAT_S_PERROR;
+	    PCI_STAT_R_MAST_AB | PCI_STAT_R_TARG_AB |
+	    PCI_STAT_S_TARG_AB | PCI_STAT_S_PERROR;
 	DEBUG1(DBG_ATTACH, dip, "pbm_configure: conf status reg=%x\n", s);
 	pbm_p->pbm_config_header->ch_status_reg = s;
 	DEBUG1(DBG_ATTACH, dip, "pbm_configure: conf status reg==%x\n",
-		pbm_p->pbm_config_header->ch_status_reg);
+	    pbm_p->pbm_config_header->ch_status_reg);
 
 	l = *pbm_p->pbm_ctrl_reg;	/* save control register state */
 	DEBUG1(DBG_ATTACH, dip, "pbm_configure: ctrl reg==%llx\n", l);
@@ -990,7 +990,7 @@ pbm_configure(pbm_t *pbm_p)
 	DEBUG1(DBG_ATTACH, dip, "pbm_configure: conf command reg=%x\n", s);
 	pbm_p->pbm_config_header->ch_command_reg = s;
 	DEBUG1(DBG_ATTACH, dip, "pbm_configure: conf command reg==%x\n",
-		pbm_p->pbm_config_header->ch_command_reg);
+	    pbm_p->pbm_config_header->ch_command_reg);
 
 	/*
 	 * The current versions of the obp are suppose to set the latency
@@ -1002,13 +1002,13 @@ pbm_configure(pbm_t *pbm_p)
 	if (pci_set_latency_timer_register) {
 		DEBUG1(DBG_ATTACH, dip,
 		    "pbm_configure: set psycho latency timer to %x\n",
-			pci_latency_timer);
+		    pci_latency_timer);
 		pbm_p->pbm_config_header->ch_latency_timer_reg =
-			pci_latency_timer;
+		    pci_latency_timer;
 	}
 
 	(void) ndi_prop_update_int(DDI_DEV_T_ANY, dip, "latency-timer",
-		(int)pbm_p->pbm_config_header->ch_latency_timer_reg);
+	    (int)pbm_p->pbm_config_header->ch_latency_timer_reg);
 }
 
 uint_t
@@ -1022,7 +1022,7 @@ pbm_disable_pci_errors(pbm_t *pbm_p)
 	 * PBM control register.
 	 */
 	*pbm_p->pbm_ctrl_reg &=
-		~(PSYCHO_PCI_CTRL_ERR_INT_EN | PSYCHO_PCI_CTRL_SBH_INT_EN);
+	    ~(PSYCHO_PCI_CTRL_ERR_INT_EN | PSYCHO_PCI_CTRL_SBH_INT_EN);
 
 	/*
 	 * Disable error interrupts via the interrupt mapping register.
@@ -1066,7 +1066,7 @@ void
 pci_iommu_config(iommu_t *iommu_p, uint64_t iommu_ctl, uint64_t cfgpa)
 {
 	volatile uint64_t *pbm_csr_p = (volatile uint64_t *)
-		get_pbm_reg_base(iommu_p->iommu_pci_p);
+	    get_pbm_reg_base(iommu_p->iommu_pci_p);
 	volatile uint64_t pbm_ctl = *pbm_csr_p;
 
 	volatile uint64_t *iommu_ctl_p = iommu_p->iommu_ctrl_reg;
@@ -1074,13 +1074,13 @@ pci_iommu_config(iommu_t *iommu_p, uint64_t iommu_ctl, uint64_t cfgpa)
 	volatile uint64_t *tsb_bar_p = iommu_p->iommu_tsb_base_addr_reg;
 
 	DEBUG2(DBG_ATTACH, iommu_p->iommu_pci_p->pci_dip,
-		"\npci_iommu_config: pbm_csr_p=%016llx pbm_ctl=%016llx",
-		pbm_csr_p, pbm_ctl);
+	    "\npci_iommu_config: pbm_csr_p=%016llx pbm_ctl=%016llx",
+	    pbm_csr_p, pbm_ctl);
 	DEBUG2(DBG_ATTACH|DBG_CONT, iommu_p->iommu_pci_p->pci_dip,
-		"\n\tiommu_ctl_p=%016llx iommu_ctl=%016llx",
-		iommu_ctl_p, iommu_ctl);
+	    "\n\tiommu_ctl_p=%016llx iommu_ctl=%016llx",
+	    iommu_ctl_p, iommu_ctl);
 	DEBUG2(DBG_ATTACH|DBG_CONT, iommu_p->iommu_pci_p->pci_dip,
-		"\n\tcfgpa=%016llx tsb_bar_val=%016llx", cfgpa, tsb_bar_val);
+	    "\n\tcfgpa=%016llx tsb_bar_val=%016llx", cfgpa, tsb_bar_val);
 
 	if (!cfgpa)
 		goto reprog;
@@ -1167,17 +1167,17 @@ pci_iommu_setup(iommu_t *iommu_p)
 	uint_t tsb_size_prop;
 
 	if (ddi_getlongprop(DDI_DEV_T_ANY, dip, DDI_PROP_DONTPASS,
-		"virtual-dma", (caddr_t)&dvma_prop, &dvma_prop_len) !=
-		DDI_PROP_SUCCESS)
+	    "virtual-dma", (caddr_t)&dvma_prop, &dvma_prop_len) !=
+	    DDI_PROP_SUCCESS)
 		goto tsb_done;
 
 	if (dvma_prop_len != sizeof (pci_dvma_range_prop_t)) {
 		cmn_err(CE_WARN, "%s%d: invalid virtual-dma property",
-			ddi_driver_name(dip), ddi_get_instance(dip));
+		    ddi_driver_name(dip), ddi_get_instance(dip));
 		goto tsb_end;
 	}
 	iommu_p->iommu_dvma_end = dvma_prop->dvma_base +
-		(dvma_prop->dvma_len - 1);
+	    (dvma_prop->dvma_len - 1);
 	tsb_size_prop = IOMMU_BTOP(dvma_prop->dvma_len) * sizeof (uint64_t);
 	tsb_size = MIN(tsb_size_prop, tsb_size);
 tsb_end:
@@ -1214,7 +1214,7 @@ uintptr_t
 get_pbm_reg_base(pci_t *pci_p)
 {
 	return ((uintptr_t)(pci_p->pci_address[0] +
-		(pci_stream_buf_exists ? 0 : PSYCHO_PCI_PBM_REG_BASE)));
+	    (pci_stream_buf_exists ? 0 : PSYCHO_PCI_PBM_REG_BASE)));
 }
 
 void
@@ -1237,7 +1237,7 @@ pci_pbm_setup(pbm_t *pbm_p)
 	 * This should be mapped little-endian.
 	 */
 	pbm_p->pbm_config_header =
-		(config_header_t *)get_config_reg_base(pci_p);
+	    (config_header_t *)get_config_reg_base(pci_p);
 
 	/*
 	 * Get the virtual addresses for control, error and diag
@@ -1246,13 +1246,13 @@ pci_pbm_setup(pbm_t *pbm_p)
 	pbm_p->pbm_ctrl_reg = (uint64_t *)(a + PSYCHO_PCI_CTRL_REG_OFFSET);
 	pbm_p->pbm_diag_reg = (uint64_t *)(a + PSYCHO_PCI_DIAG_REG_OFFSET);
 	pbm_p->pbm_async_flt_status_reg =
-		(uint64_t *)(a + PSYCHO_PCI_ASYNC_FLT_STATUS_REG_OFFSET);
+	    (uint64_t *)(a + PSYCHO_PCI_ASYNC_FLT_STATUS_REG_OFFSET);
 	pbm_p->pbm_async_flt_addr_reg =
-		(uint64_t *)(a + PSYCHO_PCI_ASYNC_FLT_ADDR_REG_OFFSET);
+	    (uint64_t *)(a + PSYCHO_PCI_ASYNC_FLT_ADDR_REG_OFFSET);
 
 	if (CHIP_TYPE(pci_p) >= PCI_CHIP_SABRE)
 		pbm_p->pbm_sync_reg_pa =
-			pci_p->pci_cb_p->cb_base_pa + DMA_WRITE_SYNC_REG;
+		    pci_p->pci_cb_p->cb_base_pa + DMA_WRITE_SYNC_REG;
 }
 
 /*ARGSUSED*/
@@ -1282,18 +1282,18 @@ pci_sc_setup(sc_t *sc_p)
 	a = get_reg_base(pci_p);
 	if (pci_p->pci_bus_range.lo != 0) {
 		sc_p->sc_data_diag_acc = (uint64_t *)
-				(a + PSYCHO_SC_A_DATA_DIAG_OFFSET);
+		    (a + PSYCHO_SC_A_DATA_DIAG_OFFSET);
 		sc_p->sc_tag_diag_acc = (uint64_t *)
-				(a + PSYCHO_SC_A_TAG_DIAG_OFFSET);
+		    (a + PSYCHO_SC_A_TAG_DIAG_OFFSET);
 		sc_p->sc_ltag_diag_acc = (uint64_t *)
-				(a + PSYCHO_SC_A_LTAG_DIAG_OFFSET);
+		    (a + PSYCHO_SC_A_LTAG_DIAG_OFFSET);
 	} else {
 		sc_p->sc_data_diag_acc = (uint64_t *)
-				(a + PSYCHO_SC_B_DATA_DIAG_OFFSET);
+		    (a + PSYCHO_SC_B_DATA_DIAG_OFFSET);
 		sc_p->sc_tag_diag_acc = (uint64_t *)
-				(a + PSYCHO_SC_B_TAG_DIAG_OFFSET);
+		    (a + PSYCHO_SC_B_TAG_DIAG_OFFSET);
 		sc_p->sc_ltag_diag_acc = (uint64_t *)
-				(a + PSYCHO_SC_B_LTAG_DIAG_OFFSET);
+		    (a + PSYCHO_SC_B_LTAG_DIAG_OFFSET);
 	}
 }
 
@@ -1301,7 +1301,7 @@ int
 pci_get_numproxy(dev_info_t *dip)
 {
 	return (ddi_prop_get_int(DDI_DEV_T_ANY, dip, DDI_PROP_DONTPASS,
-		"#upa-interrupt-proxies", 1));
+	    "#upa-interrupt-proxies", 1));
 }
 
 int
@@ -1334,7 +1334,7 @@ pbm_has_pass_1_cheerio(pci_t *pci_p)
 		if (strcmp(s, "ebus") == 0 || strcmp(s, "pci108e,1000") == 0) {
 			rev =
 			    ddi_getprop(DDI_DEV_T_ANY, cdip, DDI_PROP_DONTPASS,
-				"revision-id", 0);
+			    "revision-id", 0);
 			if (rev == 0)
 				found = 1;
 		}
@@ -1371,17 +1371,17 @@ void
 pci_kstat_init()
 {
 	pci_name_kstat = (pci_ksinfo_t *)kmem_alloc(sizeof (pci_ksinfo_t),
-		KM_NOSLEEP);
+	    KM_NOSLEEP);
 
 	if (pci_name_kstat == NULL) {
 		cmn_err(CE_WARN, "pcipsy : no space for kstat\n");
 	} else {
 		pci_name_kstat->pic_no_evs =
-			sizeof (psycho_pci_events) / sizeof (pci_kev_mask_t);
+		    sizeof (psycho_pci_events) / sizeof (pci_kev_mask_t);
 		pci_name_kstat->pic_shift[0] = PSYCHO_SHIFT_PIC0;
 		pci_name_kstat->pic_shift[1] = PSYCHO_SHIFT_PIC1;
 		pci_create_name_kstat("pcip",
-			pci_name_kstat, psycho_pci_events);
+		    pci_name_kstat, psycho_pci_events);
 	}
 }
 
@@ -1416,14 +1416,14 @@ pci_rem_pci_kstat(pci_t *pci_p)
 void
 pci_add_upstream_kstat(pci_t *pci_p)
 {
-	pci_common_t 	*cmn_p = pci_p->pci_common_p;
+	pci_common_t	*cmn_p = pci_p->pci_common_p;
 	pci_cntr_pa_t	*cntr_pa_p = &cmn_p->pci_cmn_uks_pa;
 	uint64_t regbase = va_to_pa((void *)get_reg_base(pci_p));
 
 	cntr_pa_p->pcr_pa = regbase + PSYCHO_PERF_PCR_OFFSET;
 	cntr_pa_p->pic_pa = regbase + PSYCHO_PERF_PIC_OFFSET;
 	cmn_p->pci_common_uksp = pci_create_cntr_kstat(pci_p, "pcip",
-		NUM_OF_PICS, pci_cntr_kstat_pa_update, cntr_pa_p);
+	    NUM_OF_PICS, pci_cntr_kstat_pa_update, cntr_pa_p);
 }
 
 /*
@@ -1445,7 +1445,7 @@ pci_identity_init(pci_t *pci_p)
 	if (strcmp(name, "pci108e,a001") == 0)
 		return (CHIP_ID(PCI_CHIP_HUMMINGBIRD, 0x00, 0x00));
 	cmn_err(CE_CONT, "?%s%d:using default chip identity\n",
-		ddi_driver_name(dip), ddi_get_instance(dip));
+	    ddi_driver_name(dip), ddi_get_instance(dip));
 	return (CHIP_ID(PCI_CHIP_PSYCHO, 0x00, 0x00));
 }
 
@@ -1566,13 +1566,13 @@ pci_ecc_classify(uint64_t err, ecc_errstate_t *ecc_err_p)
 	 * Get the parent bus id that caused the error.
 	 */
 	ecc_err_p->ecc_dev_id = (ecc_err_p->ecc_afsr & PSYCHO_ECC_UE_AFSR_ID)
-			>> PSYCHO_ECC_UE_AFSR_ID_SHIFT;
+	    >> PSYCHO_ECC_UE_AFSR_ID_SHIFT;
 	/*
 	 * Determine the doubleword offset of the error.
 	 */
 	ecc_err_p->ecc_dw_offset = (ecc_err_p->ecc_afsr &
-			PSYCHO_ECC_UE_AFSR_DW_OFFSET)
-			>> PSYCHO_ECC_UE_AFSR_DW_OFFSET_SHIFT;
+	    PSYCHO_ECC_UE_AFSR_DW_OFFSET)
+	    >> PSYCHO_ECC_UE_AFSR_DW_OFFSET_SHIFT;
 	/*
 	 * Determine the primary error type.
 	 */
@@ -1586,7 +1586,7 @@ pci_ecc_classify(uint64_t err, ecc_errstate_t *ecc_err_p)
 			ecc->flt_panic = ecc_ue_is_fatal(&ecc_err_p->ecc_aflt);
 		} else {
 			ecc->flt_erpt_class = ecc_err_p->ecc_pri ?
-				PCI_ECC_PIO_CE : PCI_ECC_SEC_PIO_CE;
+			    PCI_ECC_PIO_CE : PCI_ECC_SEC_PIO_CE;
 			return;
 		}
 	} else if (err & COMMON_ECC_AFSR_E_DRD) {
@@ -1599,7 +1599,7 @@ pci_ecc_classify(uint64_t err, ecc_errstate_t *ecc_err_p)
 			ecc->flt_panic = ecc_ue_is_fatal(&ecc_err_p->ecc_aflt);
 		} else {
 			ecc->flt_erpt_class = ecc_err_p->ecc_pri ?
-				PCI_ECC_DRD_CE : PCI_ECC_SEC_DRD_CE;
+			    PCI_ECC_DRD_CE : PCI_ECC_SEC_DRD_CE;
 			return;
 		}
 	} else if (err & COMMON_ECC_AFSR_E_DWR) {
@@ -1612,7 +1612,7 @@ pci_ecc_classify(uint64_t err, ecc_errstate_t *ecc_err_p)
 			ecc->flt_panic = ecc_ue_is_fatal(&ecc_err_p->ecc_aflt);
 		} else {
 			ecc->flt_erpt_class = ecc_err_p->ecc_pri ?
-				PCI_ECC_DWR_CE : PCI_ECC_SEC_DWR_CE;
+			    PCI_ECC_DWR_CE : PCI_ECC_SEC_DWR_CE;
 			return;
 		}
 	}
@@ -1622,7 +1622,7 @@ ushort_t
 pci_ecc_get_synd(uint64_t afsr)
 {
 	return ((ushort_t)((afsr & PSYCHO_ECC_CE_AFSR_SYND)
-		>> PSYCHO_ECC_CE_AFSR_SYND_SHIFT));
+	    >> PSYCHO_ECC_CE_AFSR_SYND_SHIFT));
 }
 
 /*
@@ -1681,13 +1681,13 @@ pci_clear_error(pci_t *pci_p, pbm_errstate_t *pbm_err_p)
 	*pbm_p->pbm_ctrl_reg = pbm_err_p->pbm_ctl_stat;
 	*pbm_p->pbm_async_flt_status_reg = pbm_err_p->pbm_afsr;
 	pbm_p->pbm_config_header->ch_status_reg =
-		pbm_err_p->pbm_pci.pci_cfg_stat;
+	    pbm_err_p->pbm_pci.pci_cfg_stat;
 }
 
 /*ARGSUSED*/
 int
 pci_pbm_err_handler(dev_info_t *dip, ddi_fm_error_t *derr,
-		const void *impl_data, int caller)
+    const void *impl_data, int caller)
 {
 	int fatal = 0;
 	int nonfatal = 0;
@@ -1850,11 +1850,11 @@ pci_check_error(pci_t *pci_p)
 	pbm_afsr = *pbm_p->pbm_async_flt_status_reg;
 
 	if ((pci_cfg_stat & (PCI_STAT_S_PERROR | PCI_STAT_S_TARG_AB |
-				PCI_STAT_R_TARG_AB | PCI_STAT_R_MAST_AB |
-				PCI_STAT_S_SYSERR | PCI_STAT_PERROR)) ||
-			(pbm_ctl_stat & (COMMON_PCI_CTRL_SBH_ERR |
-				COMMON_PCI_CTRL_SERR)) ||
-			(PBM_AFSR_TO_PRIERR(pbm_afsr)))
+	    PCI_STAT_R_TARG_AB | PCI_STAT_R_MAST_AB |
+	    PCI_STAT_S_SYSERR | PCI_STAT_PERROR)) ||
+	    (pbm_ctl_stat & (COMMON_PCI_CTRL_SBH_ERR |
+	    COMMON_PCI_CTRL_SERR)) ||
+	    (PBM_AFSR_TO_PRIERR(pbm_afsr)))
 		return (1);
 
 	return (0);
@@ -1879,10 +1879,10 @@ pci_pbm_errstate_get(pci_t *pci_p, pbm_errstate_t *pbm_err_p)
 	 */
 	pbm_err_p->pbm_bridge_type = PCI_BRIDGE_TYPE(pci_p->pci_common_p);
 	pbm_err_p->pbm_pci.pci_cfg_stat =
-		pbm_p->pbm_config_header->ch_status_reg;
+	    pbm_p->pbm_config_header->ch_status_reg;
 	pbm_err_p->pbm_ctl_stat = *pbm_p->pbm_ctrl_reg;
 	pbm_err_p->pbm_pci.pci_cfg_comm =
-		pbm_p->pbm_config_header->ch_command_reg;
+	    pbm_p->pbm_config_header->ch_command_reg;
 	pbm_err_p->pbm_afsr = *pbm_p->pbm_async_flt_status_reg;
 	pbm_err_p->pbm_afar = *pbm_p->pbm_async_flt_addr_reg;
 	pbm_err_p->pbm_pci.pci_pa = *pbm_p->pbm_async_flt_addr_reg;
@@ -1959,7 +1959,7 @@ pci_thermal_rem_intr(dev_info_t *rdip, uint_t inum)
 	pci_t		*pci_p;
 	dev_info_t	*pdip;
 	uint32_t	dev_mondo, pci_mondo;
-	int 		instance;
+	int		instance;
 
 	for (pdip = ddi_get_parent(rdip); pdip; pdip = ddi_get_parent(pdip)) {
 		if (strcmp(ddi_driver_name(pdip), "pcipsy") == 0)
diff --git a/usr/src/uts/sun4u/lm75/Makefile b/usr/src/uts/sun4u/lm75/Makefile
index 6f73077389..deabaede8c 100644
--- a/usr/src/uts/sun4u/lm75/Makefile
+++ b/usr/src/uts/sun4u/lm75/Makefile
@@ -22,10 +22,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-
 #	This makefile drives the lm75 build.
 #
 #	Path to the base of the uts directory tree (usually /usr/src/uts).
@@ -37,7 +33,6 @@ UTSBASE	= ../..
 #
 MODULE		= lm75
 OBJECTS		= $(LM75_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(LM75_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 
 #
@@ -45,18 +40,12 @@ ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 #
 include $(UTSBASE)/sun4u/Makefile.sun4u
 
-# 
-# lint pass one enforcement 
-# 
-CFLAGS += $(CCVERBOSE)
-
 LDFLAGS += -dy -N misc/i2c_svc
 
 #
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 .KEEP_STATE:
@@ -69,12 +58,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS)
 
 #
diff --git a/usr/src/uts/sun4u/pcf8574/Makefile b/usr/src/uts/sun4u/pcf8574/Makefile
index c5ac0684be..6913ee45dd 100644
--- a/usr/src/uts/sun4u/pcf8574/Makefile
+++ b/usr/src/uts/sun4u/pcf8574/Makefile
@@ -22,10 +22,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-
 #	This makefile drives the pcf8574 build.
 #
 #	Path to the base of the uts directory tree (usually /usr/src/uts).
@@ -37,7 +33,6 @@ UTSBASE	= ../..
 #
 MODULE		= pcf8574
 OBJECTS		= $(PCF8574_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(PCF8574_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 
 #
@@ -45,18 +40,12 @@ ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 #
 include $(UTSBASE)/sun4u/Makefile.sun4u
 
-# 
-# lint pass one enforcement 
-# 
-CFLAGS += $(CCVERBOSE)
-
 LDFLAGS += -dy -N misc/i2c_svc
 
 #
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 .KEEP_STATE:
@@ -69,12 +58,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS)
 
 #
diff --git a/usr/src/uts/sun4u/pcipsy/Makefile b/usr/src/uts/sun4u/pcipsy/Makefile
index 1857d38f95..5e9f64bd07 100644
--- a/usr/src/uts/sun4u/pcipsy/Makefile
+++ b/usr/src/uts/sun4u/pcipsy/Makefile
@@ -40,7 +40,6 @@ UTSBASE	= ../..
 #
 MODULE		= pcipsy
 OBJECTS		= $(PSYCHO_PCI_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(PSYCHO_PCI_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 
 #
@@ -52,30 +51,13 @@ include $(UTSBASE)/sun4u/Makefile.sun4u
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 #
-# lint pass one enforcement
-#
-CFLAGS += $(CCVERBOSE)
-
-#
 # Turn on doubleword alignment for 64 bit registers
 #
 CFLAGS += -dalign
 
-#
-# For now, disable these lint checks; maintainers should endeavor
-# to investigate and remove these for maximum lint coverage.
-# Please do not carry these forward to new Makefiles.
-#
-LINTTAGS	+= -erroff=E_STATIC_UNUSED
-LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
-LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
-LINTTAGS	+= -erroff=E_SUSPICIOUS_COMPARISON
-LINTTAGS	+= -erroff=E_PTRDIFF_OVERFLOW
-
 CERRWARN	+= -_gcc=-Wno-parentheses
 CERRWARN	+= $(CNOWARN_UNINIT)
 CERRWARN	+= -_gcc=-Wno-unused-function
@@ -93,12 +75,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS)
 
 #
diff --git a/usr/src/uts/sun4u/rootnex/Makefile b/usr/src/uts/sun4u/rootnex/Makefile
index e1f3d0657b..6f9a01fa67 100644
--- a/usr/src/uts/sun4u/rootnex/Makefile
+++ b/usr/src/uts/sun4u/rootnex/Makefile
@@ -40,7 +40,6 @@ UTSBASE	= ../..
 #
 MODULE		= rootnex
 OBJECTS		= $(ROOTNEX_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(ROOTNEX_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 
 #
@@ -60,23 +59,8 @@ CLEANFILES	+= $(MODSTUBS_O)
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
-#
-# lint pass one enforcement
-#
-CFLAGS += $(CCVERBOSE)
-
-#
-# For now, disable these lint checks; maintainers should endeavor
-# to investigate and remove these for maximum lint coverage.
-# Please do not carry these forward to new Makefiles.
-#
-LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
-LINTTAGS	+= -erroff=E_STATIC_UNUSED
-LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
-
 CERRWARN	+= -_gcc=-Wno-switch
 CERRWARN	+= -_gcc=-Wno-unused-variable
 CERRWARN	+= -_gcc=-Wno-parentheses
@@ -95,12 +79,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS)
 
 #
diff --git a/usr/src/uts/sun4u/zsh/Makefile b/usr/src/uts/sun4u/zsh/Makefile
index dfefb38063..22dac14bcb 100644
--- a/usr/src/uts/sun4u/zsh/Makefile
+++ b/usr/src/uts/sun4u/zsh/Makefile
@@ -39,7 +39,6 @@ UTSBASE	= ../..
 #
 MODULE		= zsh
 OBJECTS		= $(ZSH_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(ZSH_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/sun/io
 
@@ -52,28 +51,13 @@ include $(UTSBASE)/sun4u/Makefile.sun4u
 #	Define targets
 #
 ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
 #
-# lint pass one enforcement
-#
-CFLAGS += $(CCVERBOSE)
-
-#
 # Defined dependency on zs
 #
 LDFLAGS += -dy -N drv/zs
 
-#
-# For now, disable these lint checks; maintainers should endeavor
-# to investigate and remove these for maximum lint coverage.
-# Please do not carry these forward to new Makefiles.
-#
-LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
-LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
-LINTTAGS	+= -erroff=E_PTRDIFF_OVERFLOW
-
 CERRWARN	+= -_gcc=-Wno-parentheses
 
 #
@@ -89,12 +73,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS)
 
 #
diff --git a/usr/src/uts/sun4v/rootnex/Makefile b/usr/src/uts/sun4v/rootnex/Makefile
index 004b5140c2..fc8e37b5f9 100644
--- a/usr/src/uts/sun4v/rootnex/Makefile
+++ b/usr/src/uts/sun4v/rootnex/Makefile
@@ -40,7 +40,6 @@ UTSBASE	= ../..
 #
 MODULE		= rootnex
 OBJECTS		= $(ROOTNEX_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(ROOTNEX_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 
 #
@@ -60,29 +59,14 @@ CLEANFILES	+= $(MODSTUBS_O)
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
-#
-# lint pass one enforcement
-#
-CFLAGS 		+= $(CCVERBOSE)
 CERRWARN	+= -_gcc=-Wno-switch
 CERRWARN	+= -_gcc=-Wno-unused-variable
 CERRWARN	+= -_gcc=-Wno-parentheses
 CERRWARN	+= $(CNOWARN_UNINIT)
 
 #
-# For now, disable these lint checks; maintainers should endeavor
-# to investigate and remove these for maximum lint coverage.
-# Please do not carry these forward to new Makefiles.
-#
-LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
-LINTTAGS	+= -erroff=E_PTRDIFF_OVERFLOW
-LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
-LINTTAGS	+= -erroff=E_STATIC_UNUSED
-
-#
 #	Default build targets.
 #
 .KEEP_STATE:
@@ -95,12 +79,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS)
 
 #