Mercurial > illumos > illumos-gate

changeset 931:92fdf4004904

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6309273 gcc and cpr don't get along 6309381 gcc and idn don't get along 6309472 gcc and javelin envctrltwo don't get along 6310488 gcc and starcat don't get along
author mathue
date Tue, 15 Nov 2005 22:46:56 -0800
parents 1b624a2ec4bc
children 9e056184bc38
files usr/src/uts/common/cpr/cpr_dump.c usr/src/uts/common/cpr/cpr_misc.c usr/src/uts/common/cpr/cpr_uthread.c usr/src/uts/sun4u/io/sbbc.c usr/src/uts/sun4u/os/cpr_impl.c usr/src/uts/sun4u/starfire/io/idn.c usr/src/uts/sun4u/starfire/io/idn_dlpi.c usr/src/uts/sun4u/starfire/io/idn_proto.c usr/src/uts/sun4u/starfire/io/idn_smr.c usr/src/uts/sun4u/starfire/io/memctrl.c usr/src/uts/sun4u/starfire/sys/idn.h
diffstat 11 files changed, 150 insertions(+), 144 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/cpr/cpr_dump.c	Tue Nov 15 22:21:35 2005 -0800
+++ b/usr/src/uts/common/cpr/cpr_dump.c	Tue Nov 15 22:46:56 2005 -0800
@@ -275,7 +275,7 @@
 	cpr_term.real_statef_size = STAT->cs_real_statefsz +
 		btod(cpr_wptr - cpr_buf) * DEV_BSIZE;
 
-	DEBUG9(errp("cpr_dump: Real Statefile Size: %d\n",
+	DEBUG9(errp("cpr_dump: Real Statefile Size: %ld\n",
 		STAT->cs_real_statefsz));
 
 	cpr_tod_get(&cpr_term.tm_shutdown);
@@ -684,7 +684,7 @@
 	kas_cnt = i_cpr_count_special_kpages(mapflag, bitfunc);
 	kas_cnt += cpr_count_seg_pages(mapflag, bitfunc);
 
-	DEBUG9(errp("cpr_count_kpages: kas_cnt=%d\n", kas_cnt));
+	DEBUG9(errp("cpr_count_kpages: kas_cnt=%ld\n", kas_cnt));
 	DEBUG7(errp("\ncpr_count_kpages: %ld pages, 0x%lx bytes\n",
 		kas_cnt, mmu_ptob(kas_cnt)));
 	return (kas_cnt);
@@ -902,7 +902,7 @@
 
 	i_cpr_mapin(CPR->c_mapping_area, npg, pfn);
 
-	DEBUG3(errp("mapped-in %d pages, vaddr 0x%p, pfn 0x%x\n",
+	DEBUG3(errp("mapped-in %ld pages, vaddr 0x%p, pfn 0x%lx\n",
 		npg, CPR->c_mapping_area, pfn));
 
 	/*
@@ -979,7 +979,7 @@
 				return (ENOSPC);
 		}
 
-		DEBUG3(errp("cpr_write: frmp=%x wptr=%x cnt=%x...",
+		DEBUG3(errp("cpr_write: frmp=%p wptr=%p cnt=%lx...",
 			fromp, cpr_wptr, bytes));
 		/*
 		 * cross check, this should not happen!
--- a/usr/src/uts/common/cpr/cpr_misc.c	Tue Nov 15 22:21:35 2005 -0800
+++ b/usr/src/uts/common/cpr/cpr_misc.c	Tue Nov 15 22:46:56 2005 -0800
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -631,7 +631,8 @@
 		int ndvram;
 
 		ndvram = 0;
-		(void) callb_execute_class(CB_CL_CPR_FB, (int)&ndvram);
+		(void) callb_execute_class(CB_CL_CPR_FB,
+		    (int)(uintptr_t)&ndvram);
 		if (cpr_debug & (LEVEL1 | LEVEL6))
 			errp("ndvram size = %d\n", ndvram);
 
@@ -671,7 +672,7 @@
 		 */
 		STAT->cs_est_statefsz = size;
 		if (cpr_debug & (LEVEL1 | LEVEL6))
-			errp("%s Estimated statefile size %d, space %lu\n",
+			errp("%s Estimated statefile size %llu, space %lu\n",
 			    str, size, space);
 		if (size > space) {
 			cpr_err(CE_CONT, "Statefile partition too small.");
@@ -897,7 +898,7 @@
 		}
 	} while ((cp = cp->cpu_next) != cpu_list);
 	if (brought_up_boot && (cpr_debug & (LEVEL1 | LEVEL6)))
-		errp("changed cpu %d to state %d\n", bootcpu, CPU_CPR_ONLINE);
+		errp("changed cpu %p to state %d\n", bootcpu, CPU_CPR_ONLINE);
 	mutex_exit(&cpu_lock);
 
 	return (rc);
@@ -1016,6 +1017,7 @@
 	default:
 		cpr_err(CE_PANIC, "invalid statefile type");
 		/*NOTREACHED*/
+		return (NULL);
 	}
 }
 
--- a/usr/src/uts/common/cpr/cpr_uthread.c	Tue Nov 15 22:21:35 2005 -0800
+++ b/usr/src/uts/common/cpr/cpr_uthread.c	Tue Nov 15 22:46:56 2005 -0800
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -196,16 +196,16 @@
 			DEBUG1(errp("Suspend failed: cannt stop "
 				"uthread\n"));
 			cpr_err(CE_WARN, "Suspend cannot stop "
-				"process %s (%x:%x).",
-				ttoproc(tp)->p_user.u_psargs, (int)tp,
+				"process %s (%p:%x).",
+				ttoproc(tp)->p_user.u_psargs, (void *)tp,
 				tp->t_state);
 			cpr_err(CE_WARN, "Process may be waiting for"
 				" network request, please try again.");
 			}
 
-			DEBUG2(errp("cant stop t=%x state=%x pfg=%x sched=%x\n",
+			DEBUG2(errp("cant stop t=%p state=%x pfg=%x sched=%x\n",
 			tp, tp->t_state, tp->t_proc_flag, tp->t_schedflag));
-			DEBUG2(errp("proc %x state=%x pid=%d\n",
+			DEBUG2(errp("proc %p state=%x pid=%d\n",
 				ttoproc(tp), ttoproc(tp)->p_stat,
 				ttoproc(tp)->p_pidp->pid_id));
 			return (1);
--- a/usr/src/uts/sun4u/io/sbbc.c	Tue Nov 15 22:21:35 2005 -0800
+++ b/usr/src/uts/sun4u/io/sbbc.c	Tue Nov 15 22:46:56 2005 -0800
@@ -1047,7 +1047,7 @@
 			ret = DDI_SUCCESS;
 			break;
 		case DDI_INFO_DEVT2INSTANCE:
-			*result = (void *)instance;
+			*result = (void *)(uintptr_t)instance;
 			ret = DDI_SUCCESS;
 			break;
 		default:
--- a/usr/src/uts/sun4u/os/cpr_impl.c	Tue Nov 15 22:21:35 2005 -0800
+++ b/usr/src/uts/sun4u/os/cpr_impl.c	Tue Nov 15 22:46:56 2005 -0800
@@ -1089,8 +1089,8 @@
 		descp->csd_usum = cpd.cpd_usum;
 		if (test_usum != descp->csd_usum) {
 			DEBUG1(errp("\nWARNING: i_cpr_compress_and_save: "
-			    "Data in the range of pfn 0x%x to pfn "
-			    "0x%x has changed after they are saved "
+			    "Data in the range of pfn 0x%lx to pfn "
+			    "0x%lx has changed after they are saved "
 			    "into storage.", spfn, (spfn + pages - 1)));
 		}
 #endif
@@ -1203,7 +1203,7 @@
 	*pgsp = npages;
 	len = mmu_ptob(npages);
 	end = *endpp = descp + (len / (sizeof (**basepp)));
-	DEBUG7(errp("npages 0x%x, len 0x%x, items 0x%x\n\t*basepp "
+	DEBUG7(errp("npages 0x%lx, len 0x%lx, items 0x%lx\n\t*basepp "
 	    "%p, *endpp %p\n", npages, len, (len / (sizeof (**basepp))),
 	    *basepp, *endpp));
 	i_cpr_storage_desc_init(descp, npages, end);
@@ -1252,7 +1252,7 @@
 		prom_printf(" \b");
 	}
 
-	DEBUG7(errp("\ni_cpr_dump_sensitive_kpages: dumped %d\n",
+	DEBUG7(errp("\ni_cpr_dump_sensitive_kpages: dumped %ld\n",
 	    i_cpr_sensitive_pgs_dumped));
 	return (0);
 }
@@ -1326,7 +1326,7 @@
 	/* Write cpr page descriptor */
 	error = cpr_write(vp, (caddr_t)&cpd, sizeof (cpd));
 	if (error) {
-		DEBUG7(errp("descp: %x\n", descp));
+		DEBUG7(errp("descp: %p\n", descp));
 #ifdef DEBUG
 		debug_enter("cpr_dump_sensitive: cpr_write() page "
 			"descriptor failed!\n");
@@ -1340,8 +1340,8 @@
 	error = cpr_write(vp, (caddr_t)datap, cpd.cpd_length);
 	if (error) {
 		DEBUG7(errp("error: %x\n", error));
-		DEBUG7(errp("descp: %x\n", descp));
-		DEBUG7(errp("cpr_write(%x, %x , %x)\n", vp, datap,
+		DEBUG7(errp("descp: %p\n", descp));
+		DEBUG7(errp("cpr_write(%p, %p , %lx)\n", vp, datap,
 			cpd.cpd_length));
 #ifdef DEBUG
 		debug_enter("cpr_dump_sensitive: cpr_write() data failed!\n");
@@ -1367,7 +1367,7 @@
 
 	total_pgs_dumped = regular_pgs_dumped + i_cpr_sensitive_pgs_dumped;
 
-	DEBUG7(errp("\ncheck_pgs: reg %d + sens %d = %d, expect %d\n\n",
+	DEBUG7(errp("\ncheck_pgs: reg %d + sens %ld = %d, expect %d\n\n",
 	    regular_pgs_dumped, i_cpr_sensitive_pgs_dumped,
 	    total_pgs_dumped, pgs_expected));
 
@@ -1633,7 +1633,7 @@
 		dst += MMU_PAGESIZE;
 	}
 
-	DEBUG1(errp("saved %d prom pages\n", ppage_count));
+	DEBUG1(errp("saved %ld prom pages\n", ppage_count));
 }
 
 
@@ -1662,7 +1662,7 @@
 
 	dcache_flushall();
 
-	DEBUG1(errp("restored %d prom pages\n", ppage_count));
+	DEBUG1(errp("restored %ld prom pages\n", ppage_count));
 }
 
 
@@ -1693,7 +1693,7 @@
 		if (ppage_buf) {
 			ASSERT(ppage_count);
 			kmem_free(ppage_buf, mmu_ptob(ppage_count));
-			DEBUG1(errp("freed %d prom pages\n", ppage_count));
+			DEBUG1(errp("freed %ld prom pages\n", ppage_count));
 			ppage_buf = NULL;
 			ppage_count = 0;
 		}
@@ -1831,7 +1831,7 @@
 		bcopy(cpr_sector, base, sizeof (cpr_sector));
 		*bufpp = base + sizeof (cpr_sector);
 		*blkno = cpr_statefile_offset();
-		DEBUG1(errp("statefile data size: %lld\n\n", bytes));
+		DEBUG1(errp("statefile data size: %ld\n\n", bytes));
 		return (cpr_flush_write(vp));
 	}
 }
--- a/usr/src/uts/sun4u/starfire/io/idn.c	Tue Nov 15 22:21:35 2005 -0800
+++ b/usr/src/uts/sun4u/starfire/io/idn.c	Tue Nov 15 22:46:56 2005 -0800
@@ -1048,7 +1048,7 @@
 	mboxareasize &= ~((ulong_t)IDN_SMR_BUFSIZE - 1);
 #ifdef DEBUG
 	if ((ulong_t)IDN_SLAB_SIZE < mboxareasize) {
-		PR_DRV("%s: slab size(%ld) < mailbox area(%ld)",
+		PR_DRV("%s: slab size(%d) < mailbox area(%ld)",
 			proc, IDN_SLAB_SIZE, mboxareasize);
 		/* not fatal */
 	}
@@ -1143,7 +1143,7 @@
 	if (idn_prom_getsmr(&smr_size, &obp_paddr, &obp_size) < 0)
 		return (-1);
 
-	PR_PROTO("%s: smr_size = %d, obp_paddr = 0x%llx, obp_size = 0x%llx\n",
+	PR_PROTO("%s: smr_size = %d, obp_paddr = 0x%lx, obp_size = 0x%lx\n",
 		proc, smr_size, obp_paddr, obp_size);
 
 	if (IDN_SMR_SIZE)
@@ -1227,8 +1227,8 @@
 	}
 
 	if (idn.dip != NULL) {
-		PR_DRV("%s: already initialized (dip = 0x%x)\n",
-			proc, (uint_t)idn.dip);
+		PR_DRV("%s: already initialized (dip = 0x%p)\n",
+			proc, idn.dip);
 		return (0);
 	}
 
@@ -1261,7 +1261,7 @@
 		for (s = 0; (1 << s) < IDN_SMR_BUFSIZE_MIN; s++)
 			;
 		idn.bframe_shift = s;
-		PR_DRV("%s: idn.bframe_shift = %d, minbuf = %ld\n",
+		PR_DRV("%s: idn.bframe_shift = %d, minbuf = %d\n",
 			proc, idn.bframe_shift, IDN_SMR_BUFSIZE_MIN);
 
 		ASSERT((uint_t)IDN_OFFSET2BFRAME(MB2B(idn_smr_size)) <
@@ -1641,7 +1641,7 @@
 		if (((stp->ss_flags & (IDNSFAST|IDNSRAW)) == 0) ||
 				(stp->ss_state != DL_IDLE) ||
 				(sip == NULL)) {
-			PR_DLPI("%s: fl=0x%lx, st=0x%lx, ret(EPROTO)\n",
+			PR_DLPI("%s: fl=0x%x, st=0x%x, ret(EPROTO)\n",
 				proc, stp->ss_flags, stp->ss_state);
 			merror(wq, mp, EPROTO);
 
@@ -1666,8 +1666,8 @@
 			qenable(wq);
 
 		} else {
-			PR_DLPI("%s: idndl_start(sip=0x%x)\n",
-				proc, (uint_t)sip);
+			PR_DLPI("%s: idndl_start(sip=0x%p)\n",
+				proc, sip);
 			rw_enter(&stp->ss_rwlock, RW_READER);
 			(void) idndl_start(wq, mp, sip);
 			rw_exit(&stp->ss_rwlock);
@@ -1730,8 +1730,8 @@
 		switch (DB_TYPE(mp)) {
 		case M_DATA:
 			if (sip) {
-				PR_DLPI("%s: idndl_start(sip=0x%x)\n",
-					proc, (uint_t)sip);
+				PR_DLPI("%s: idndl_start(sip=0x%p)\n",
+					proc, sip);
 				rw_enter(&stp->ss_rwlock, RW_READER);
 				err = idndl_start(wq, mp, sip);
 				rw_exit(&stp->ss_rwlock);
@@ -1777,7 +1777,7 @@
 		 */
 		cmn_err(CE_WARN,
 			"IDN: 123: unexpected M_DATA packets for "
-			"q_stream 0x%x", (uint_t)rq->q_stream);
+			"q_stream 0x%p", rq->q_stream);
 		freemsg(mp);
 		err = ENXIO;
 		break;
@@ -1929,8 +1929,8 @@
 
 	sbp = *sbpp;
 
-	PR_PROTO("%s: KICKED OFF (sigbintr pointer = 0x%x)\n",
-		proc, (uint_t)sbp);
+	PR_PROTO("%s: KICKED OFF (sigbintr pointer = 0x%p)\n",
+		proc, sbp);
 
 	ASSERT(sbp == &idn.sigbintr);
 
@@ -1981,7 +1981,7 @@
 
 		if (mbp->len != sizeof (idnsb_data_t)) {
 			PR_PROTO("%s: sigblk mbox length (%d) != "
-				"expected (%d)\n", proc, mbp->len,
+				"expected (%lu)\n", proc, mbp->len,
 				sizeof (idnsb_data_t));
 			SET_IDNKERR_ERRNO(sep, EINVAL);
 			SET_IDNKERR_IDNERR(sep, IDNKERR_DATA_LEN);
@@ -2214,7 +2214,7 @@
 	if (idn.sigb_threadp) {
 		cmn_err(CE_WARN,
 			"IDN: 126: sigbhandler thread already "
-			"exists (0x%x)", (uint_t)idn.sigb_threadp);
+			"exists (0x%p)", idn.sigb_threadp);
 		return;
 	}
 	cv_init(&idn.sigbintr.sb_cv, NULL, CV_DEFAULT, NULL);
@@ -4054,10 +4054,17 @@
 #define	HEXSPACE(v, t, w, s)	_hexspace((uint64_t)(v), sizeof (t), (w), (s))
 
 #define	DECSPACE(n, w, s) \
-	(_SSS((n) >= 10000000, 8, (w), (s)) : \
-	_SSS((n) >= 1000000, 7, (w), (s)) : \
-	_SSS((n) >= 100000, 6, (w), (s)) : \
-	_SSS((n) >= 10000, 5, (w), (s)) : \
+	(_SSS((uint_t)(n) >= 10000000, 8, (w), (s)) : \
+	_SSS((uint_t)(n) >= 1000000, 7, (w), (s)) : \
+	_SSS((uint_t)(n) >= 100000, 6, (w), (s)) : \
+	_SSS((uint_t)(n) >= 10000, 5, (w), (s)) : \
+	_SSS((uint_t)(n) >= 1000, 4, (w), (s)) : \
+	_SSS((uint_t)(n) >= 100, 3, (w), (s)) : \
+	_SSS((uint_t)(n) >= 10, 2, (w), (s)) : \
+	_get_spaces((w), (s), 1))
+
+#define	DECSPACE16(n, w, s) \
+	(_SSS((n) >= 10000, 5, (w), (s)) : \
 	_SSS((n) >= 1000, 4, (w), (s)) : \
 	_SSS((n) >= 100, 3, (w), (s)) : \
 	_SSS((n) >= 10, 2, (w), (s)) : \
@@ -4073,11 +4080,11 @@
 		HEXSPACE(mtp->mt_header.mh_svr_active_ptr, \
 			mtp->mt_header.mh_svr_active_ptr, 8, 2), \
 	*(ushort_t *)(IDN_OFFSET2ADDR(mtp->mt_header.mh_svr_ready_ptr)), \
-	DECSPACE(*(ushort_t *) \
+	DECSPACE16(*(ushort_t *) \
 			(IDN_OFFSET2ADDR(mtp->mt_header.mh_svr_ready_ptr)), \
 			1, 1), \
 	*(ushort_t *)(IDN_OFFSET2ADDR(mtp->mt_header.mh_svr_active_ptr)), \
-	DECSPACE(*(ushort_t *) \
+	DECSPACE16(*(ushort_t *) \
 			(IDN_OFFSET2ADDR(mtp->mt_header.mh_svr_active_ptr)), \
 			1, 5), \
 	mtp->mt_header.mh_cookie, \
@@ -4598,7 +4605,7 @@
 	if ((dbp = dbuffer = ALLOC_DISPSTRING()) == NULL)
 		dbp = alt_dbuffer;
 
-	if ((int)cp == 0)
+	if (cp == NULL)
 		domset = DOMAINSET(idn.localid);
 	else
 		domset = DOMAINSET_ALL;
@@ -4785,9 +4792,9 @@
 	len += NCPU * idn_dmv_pending_max * sizeof (idn_dmv_msg_t);
 	len = roundup(len, PAGESIZE);
 
-	PR_PROTO("%s: sizeof (idn_dmv_data_t) = %d\n",
+	PR_PROTO("%s: sizeof (idn_dmv_data_t) = %lu\n",
 		proc, sizeof (idn_dmv_data_t));
-	PR_PROTO("%s: allocating %d bytes for dmv data area\n", proc, len);
+	PR_PROTO("%s: allocating %lu bytes for dmv data area\n", proc, len);
 
 	idn.intr.dmv_data_len = len;
 	idn.intr.dmv_data = kmem_zalloc(len, KM_SLEEP);
@@ -5368,14 +5375,14 @@
 			PR_PROTO("cpuset2str(cpu = %d) buffer "
 				"OVERFLOW <<<<<<\n", c);
 			PR_PROTO("*******************************\n");
-			(void) sprintf(&buffer[_DSTRLEN-6], "*OVER\0");
+			(void) sprintf(&buffer[_DSTRLEN-6], "*OVER");
 			return;
 		}
 #endif /* DEBUG */
 		if (n == 0)
-			(void) sprintf(buffer, "%d\0", c);
+			(void) sprintf(buffer, "%d", c);
 		else
-			(void) sprintf(buffer, "%s, %d\0", buffer, c);
+			(void) sprintf(buffer, "%s, %d", buffer, c);
 		n++;
 	}
 }
@@ -5407,9 +5414,9 @@
 		if ((mask & (1 << i)) == 0)
 			continue;
 		if (n == 0)
-			(void) sprintf(buffer, "%d\0", i);
+			(void) sprintf(buffer, "%d", i);
 		else
-			(void) sprintf(buffer, "%s, %d\0", buffer, i);
+			(void) sprintf(buffer, "%s, %d", buffer, i);
 		n++;
 	}
 }
@@ -5602,12 +5609,12 @@
 		}
 	} else if (obpsize < (uint64_t)MB2B(smrsize)) {
 		cmn_err(CE_WARN,
-			"!IDN: 140: OBP region (%lld B) smaller "
+			"!IDN: 140: OBP region (%ld B) smaller "
 			"than requested size (%ld B)",
 			obpsize, MB2B(smrsize));
 	} else if ((obpaddr & ((uint64_t)IDN_SMR_ALIGN - 1)) != 0) {
 		cmn_err(CE_WARN,
-			"!IDN: 141: OBP region (0x%llx) not on (0x%lx) "
+			"!IDN: 141: OBP region (0x%lx) not on (0x%x) "
 			"boundary", obpaddr, IDN_SMR_ALIGN);
 	} else {
 		*sizep = obpsize;
@@ -5759,8 +5766,8 @@
 
 	ptr = kmem_zalloc(size, KM_SLEEP);
 
-	PR_ALLOC("%s: ptr 0x%x, struct(%s), size = %d\n",
-		proc, (uint_t)ptr, structname, size);
+	PR_ALLOC("%s: ptr 0x%p, struct(%s), size = %d\n",
+		proc, ptr, structname, size);
 
 	return (ptr);
 }
@@ -5770,8 +5777,8 @@
 {
 	procname_t	proc = "FREESTRUCT";
 
-	PR_ALLOC("%s: ptr 0x%x, struct(%s), size = %d\n",
-		proc, (uint_t)ptr, structname, size);
+	PR_ALLOC("%s: ptr 0x%p, struct(%s), size = %d\n",
+		proc, ptr, structname, size);
 
 	ASSERT(ptr != NULL);
 	kmem_free(ptr, size);
--- a/usr/src/uts/sun4u/starfire/io/idn_dlpi.c	Tue Nov 15 22:21:35 2005 -0800
+++ b/usr/src/uts/sun4u/starfire/io/idn_dlpi.c	Tue Nov 15 22:46:56 2005 -0800
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -732,8 +732,8 @@
 		"idndl_proto start:  wq %p dlprim %X", wq, prim);
 
 #ifdef DEBUG
-	PR_DLPI("%s: stp = 0x%x, wq = 0x%x, dlprim = 0x%lx(%s)\n",
-		proc, (uint_t)stp, (uint_t)wq, prim, dlprim2str(prim));
+	PR_DLPI("%s: stp = 0x%p, wq = 0x%p, dlprim = 0x%x(%s)\n",
+		proc, stp, wq, prim, dlprim2str(prim));
 #endif /* DEBUG */
 
 	rw_enter(&stp->ss_rwlock, RW_WRITER);
@@ -1845,7 +1845,7 @@
 	int		pktlen;
 	procname_t	proc = "idndl_read";
 
-	PR_DLPI("%s: incoming msgsize = %d, msgdsize = %d\n",
+	PR_DLPI("%s: incoming msgsize = %lu, msgdsize = %lu\n",
 		proc, msgsize(mp), msgdsize(mp));
 
 	ehp = (struct ether_header *)mp->b_rptr;
--- a/usr/src/uts/sun4u/starfire/io/idn_proto.c	Tue Nov 15 22:21:35 2005 -0800
+++ b/usr/src/uts/sun4u/starfire/io/idn_proto.c	Tue Nov 15 22:46:56 2005 -0800
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -2965,7 +2965,7 @@
 	 * he's not waiting on his protojob queue.
 	 */
 	targ |= domid & 0x0f;
-	(void) timeout(idn_link_established, (void *)targ, 50);
+	(void) timeout(idn_link_established, (void *)(uintptr_t)targ, 50);
 
 	cmn_err(CE_NOTE,
 		"!IDN: 200: link (domain %d, CPU %d) connected",
@@ -4463,7 +4463,7 @@
 static int
 idn_xstate_transfunc(int domid, void *transarg)
 {
-	uint_t		msg = (uint_t)transarg;
+	uint_t		msg = (uint_t)(uintptr_t)transarg;
 	uint_t		token;
 	procname_t	proc = "idn_xstate_transfunc";
 
@@ -4787,7 +4787,7 @@
 {
 	int	first_link;
 	int	domid, masterid;
-	uint_t	info = (uint_t)arg;
+	uint_t	info = (uint_t)(uintptr_t)arg;
 
 	first_link = (int)(info & 0xf0);
 	domid = (int)(info & 0x0f);
@@ -5386,7 +5386,7 @@
 		 */
 #ifdef DEBUG
 		if (bufoffset != sizeof (smr_pkthdr_t))
-			PR_DATA("%s:%d: offset ALIGNMENT (%d -> %ld) "
+			PR_DATA("%s:%d: offset ALIGNMENT (%lu -> %u) "
 				"(data_rptr = %p)\n",
 				proc, dst_domid, sizeof (smr_pkthdr_t),
 				bufoffset, data_rptr);
@@ -5791,7 +5791,7 @@
 		cmn_err(CE_WARN,
 #endif /* DEBUG */
 			"IDN: 216: (0x%x)msgtype/(0x%x)acktype rcvd from "
-			"domain %d", proc, msgtype, acktype, domid);
+			"domain %d", msgtype, acktype, domid);
 		break;
 	}
 
@@ -6090,7 +6090,7 @@
 		dp->dcfgphase = phase;
 
 		PR_PROTO("%s:%d:%d: sending BOARDSET (0x%x), MTU (0x%lx), "
-			"BUFSIZE (0x%lx)\n", proc, domid, phase,
+			"BUFSIZE (0x%x)\n", proc, domid, phase,
 			ldp->dhw.dh_boardset, IDN_MTU, IDN_SMR_BUFSIZE);
 
 		IDNXDC(domid, &mt, cfg_subtype.val,
@@ -6310,7 +6310,7 @@
 		dp->dcfgphase = phase;
 
 		PR_PROTO("%s:%d:%d: sending BOARDSET (0x%x), MTU (0x%lx), "
-			"BUFSIZE (0x%lx)\n",
+			"BUFSIZE (0x%x)\n",
 			proc, domid, phase, ldp->dhw.dh_boardset, IDN_MTU,
 			IDN_SMR_BUFSIZE);
 
@@ -6990,7 +6990,7 @@
 	if ((int)dp->dncfgitems < IDN_SLAVE_NCFGITEMS)
 		return (CFG_CONTINUE);
 
-	if ((dp->dnetid == -1) ||
+	if ((dp->dnetid == (ushort_t)-1) ||
 	    CPUSET_ISNULL(dp->dcpuset) ||
 	    (dp->dhw.dh_boardset == 0) ||
 	    (dp->dmbox.m_send->mm_smr_mboxp == NULL) ||
@@ -7152,7 +7152,7 @@
 	IDN_GLOCK_SHARED();
 	if ((idn.smr.rempfn == PFN_INVALID) ||
 	    (idn.smr.rempfnlim == PFN_INVALID) ||
-	    (dp->dnetid == -1) ||
+	    (dp->dnetid == (ushort_t)-1) ||
 	    CPUSET_ISNULL(dp->dcpuset) ||
 	    (dp->dhw.dh_boardset == 0) ||
 	    (nmcadr != dp->dhw.dh_nmcadr) ||
@@ -8299,7 +8299,7 @@
 
 				if (dp->dstate == IDNDS_CONNECTED)
 					(void) timeout(idn_retry_nodename_req,
-							(void *)domid, hz);
+					    (void *)(uintptr_t)domid, hz);
 			default:
 				break;
 			}
@@ -8931,7 +8931,7 @@
 static void
 idn_retry_nodename_req(void *arg)
 {
-	int	domid = (int)arg;
+	int	domid = (int)(uintptr_t)arg;
 
 	idn_send_nodename_req(domid);
 }
@@ -8971,7 +8971,8 @@
 		 */
 		PR_PROTO("%s:%d: buffer alloc failed [dstate = %s]\n",
 			proc, domid, idnds_str[dp->dstate]);
-		(void) timeout(idn_retry_nodename_req, (void *)domid, hz);
+		(void) timeout(idn_retry_nodename_req, (void *)(uintptr_t)domid,
+		    hz);
 		IDN_DUNLOCK(domid);
 		return;
 	}
@@ -9027,7 +9028,7 @@
 	length = (int)(*b_bufp++ & 0xff);
 
 	if (length < strlen(ldp->dname)) {
-		PR_PROTO("%s:%d: buffer not big enough (req %d, got %d)\n",
+		PR_PROTO("%s:%d: buffer not big enough (req %lu, got %d)\n",
 			proc, domid, strlen(ldp->dname), length);
 		IDN_DUNLOCK(idn.localid);
 		idn_send_nodename_resp(domid, mtp, bufoffset, EINVAL);
@@ -9099,7 +9100,7 @@
 	 */
 	reserved_size = IDNROUNDUP(IDN_MBOXAREA_SIZE, IDN_SMR_BUFSIZE);
 
-	PR_PROTO("%s: reserving %d bytes for mailbox area\n",
+	PR_PROTO("%s: reserving %lu bytes for mailbox area\n",
 		proc, reserved_size);
 
 #ifdef DEBUG
@@ -9590,7 +9591,7 @@
 	procname_t		proc = "idn_retry_submit";
 
 	if (ticks < 0) {
-		PR_PROTO("%s: (token = 0x%x) WARNING ticks = %l\n",
+		PR_PROTO("%s: (token = 0x%x) WARNING ticks = %ld\n",
 			proc, token, ticks);
 		return;
 	}
@@ -9848,8 +9849,8 @@
 
 	ASSERT(pq->q_id == *id);
 
-	PR_PROTO("%s: id %d starting up (pq = 0x%x)\n",
-		proc, pq->q_id, (uint_t)pq);
+	PR_PROTO("%s: id %d starting up (pq = 0x%p)\n",
+		proc, pq->q_id, pq);
 
 	/*CONSTCOND*/
 	while (1) {
@@ -10002,8 +10003,8 @@
 
 	ASSERT(mtp && (ntbls > 0));
 
-	PR_PROTO("%s: init mboxtbl (0x%x) ntbls = %d\n",
-		proc, (uint_t)mtp, ntbls);
+	PR_PROTO("%s: init mboxtbl (0x%p) ntbls = %d\n",
+		proc, mtp, ntbls);
 
 	for (d = 0; d < ntbls; d++) {
 		register int	pd, sd;
@@ -10161,7 +10162,7 @@
 		return;
 
 	PR_PROTO("%s: %s deactivating main mailboxes for domset 0x%x\n",
-		proc, (domset == (uint_t)-1) ? "STOP-ALL" : "NORMAL", domset);
+		proc, (domset == (ushort_t)-1) ? "STOP-ALL" : "NORMAL", domset);
 
 	svr_count = idn_mainmbox_chan_unregister(domset, -1);
 
@@ -10603,7 +10604,7 @@
 	}
 	IDN_DUNLOCK(idn.localid);
 
-	PR_CHAN("%s: channel(%d) mainhp = 0x%x\n", proc, channel, (uint_t)mhp);
+	PR_CHAN("%s: channel(%d) mainhp = 0x%p\n", proc, channel, mhp);
 
 	return (mhp);
 }
@@ -10628,7 +10629,7 @@
 }
 #define	CHANSVR_NEXT_DOMID(csp, i, d) \
 { \
-	(i) = ++(i) & (MAX_DOMAINS - 1); \
+	(i) = ((i) + 1) & (MAX_DOMAINS - 1); \
 	(d) = (int)(((csp)->ch_recv_scanset >> ((i) << 2)) & 0xf); \
 }
 #define	CHANSVR_RESET_INDEX(i)	((i) = -1)
@@ -10946,8 +10947,8 @@
 				tot_pktcount, tot_dropcount);
 			PR_CHAN("%s: (channel %d) TERMINATING\n",
 				proc, channel);
-			PR_CHAN("%s: (channel %d) ch_morguep = %x\n",
-				proc, channel, (uint_t)csp->ch_recv_morguep);
+			PR_CHAN("%s: (channel %d) ch_morguep = %p\n",
+				proc, channel, csp->ch_recv_morguep);
 
 			csp->ch_recv_threadp = NULL;
 #ifdef DEBUG
@@ -11398,7 +11399,7 @@
 		IDN_CHAN_DOMAIN_REGISTER(csp, d);
 
 		PR_CHAN("%s: domain %d (channel %d) RECV (pending) "
-			"scanset = 0x%llx\n", proc, d, channel,
+			"scanset = 0x%lx\n", proc, d, channel,
 			csp->ch_recv_scanset_pending);
 		PR_CHAN("%s: domain %d (channel %d) domset = 0x%x\n",
 			proc, d, channel, (uint_t)csp->ch_reg_domset);
@@ -11457,7 +11458,7 @@
 		IDN_CHAN_DOMAIN_UNREGISTER(csp, d);
 
 		PR_CHAN("%s: domain %d (channel %d) RECV (pending) "
-			"scanset = 0x%llx\n", proc, d, channel,
+			"scanset = 0x%lx\n", proc, d, channel,
 			csp->ch_recv_scanset_pending);
 		PR_CHAN("%s: domain %d (channel %d) domset = 0x%x\n",
 			proc, d, channel, (uint_t)csp->ch_reg_domset);
@@ -11477,9 +11478,6 @@
 {
 	uchar_t	*eap;
 
-	if (ehp->ether_type > ETHERTYPE_MAX)
-		return (0);
-
 	eap = &ehp->ether_dhost.ether_addr_octet[0];
 
 	if ((eap[IDNETHER_ZERO] != 0) && (eap[IDNETHER_ZERO] != 0xff))
@@ -11497,11 +11495,11 @@
 		(eap[IDNETHER_RESERVED] != 0xff))
 		return (0);
 
-	if (!VALID_CHANNEL(eap[IDNETHER_CHANNEL]) &&
+	if (!VALID_UCHANNEL(eap[IDNETHER_CHANNEL]) &&
 		(eap[IDNETHER_CHANNEL] != 0xff))
 		return (0);
 
-	if (!VALID_DOMAINID(IDN_NETID2DOMID(eap[IDNETHER_NETID])) &&
+	if (!VALID_UDOMAINID(IDN_NETID2DOMID(eap[IDNETHER_NETID])) &&
 		(eap[IDNETHER_NETID] != 0xff))
 		return (0);
 
@@ -11724,7 +11722,7 @@
 	apktlen = pktlen;
 
 	if ((pktlen <= 0) || (pktlen > IDN_DATA_SIZE)) {
-		PR_DATA("%s: invalid packet length (%d) <= 0 || > %d\n",
+		PR_DATA("%s: invalid packet length (%d) <= 0 || > %lu\n",
 			proc, pktlen, IDN_DATA_SIZE);
 		IDN_KSTAT_INC(sip, si_buff);
 		IDN_KSTAT_INC(sip, si_toolong_errors);
@@ -12464,8 +12462,8 @@
 		 */
 		if (IDN_CHANNEL_IS_ENABLED(csp) &&
 			((mainhp = idn_chan_server_syncheader(c)) != NULL)) {
-			PR_CHAN("%s: marking chansvr (mhp=0x%x) %d READY\n",
-				proc, (uint_t)mainhp, c);
+			PR_CHAN("%s: marking chansvr (mhp=0x%p) %d READY\n",
+				proc, mainhp, c);
 			mainhp->mh_svr_ready = 1;
 		}
 
@@ -12716,9 +12714,9 @@
 			continue;
 		}
 
-		PR_CHAN("%s: pointing chansvr %d to morgue (0x%x)\n",
-			proc, c, central_morguep ? (uint_t)central_morguep
-						: (uint_t)csp->ch_recv_morguep);
+		PR_CHAN("%s: pointing chansvr %d to morgue (0x%p)\n",
+			proc, c, central_morguep ? central_morguep
+						: csp->ch_recv_morguep);
 
 		if (central_morguep == NULL) {
 			central_morguep = csp->ch_recv_morguep;
@@ -12751,7 +12749,7 @@
 
 	PR_CHAN("%s: waiting for %d (chnset=0x%x) chan svrs to term\n",
 		proc, cs_count, chanset);
-	PR_CHAN("%s: morguep = 0x%x\n", proc, (uint_t)central_morguep);
+	PR_CHAN("%s: morguep = 0x%p\n", proc, central_morguep);
 
 	ASSERT((cs_count > 0) ? (central_morguep != NULL) : 1);
 	while (cs_count-- > 0)
@@ -12821,7 +12819,7 @@
 	int		not_active, channel;
 	idn_chansvr_t	*csp;
 
-	channel = (int)chn;
+	channel = (int)(uintptr_t)chn;
 
 	IDN_GLOCK_SHARED();
 	if (idn.chan_servers == NULL) {
@@ -12872,7 +12870,7 @@
 	if (lock_try(&csp->ch_initlck) == 0)
 		return;
 
-	(void) timeout(idn_exec_chanactivate, (caddr_t)channel, 1);
+	(void) timeout(idn_exec_chanactivate, (caddr_t)(uintptr_t)channel, 1);
 }
 
 /*ARGSUSED0*/
--- a/usr/src/uts/sun4u/starfire/io/idn_smr.c	Tue Nov 15 22:21:35 2005 -0800
+++ b/usr/src/uts/sun4u/starfire/io/idn_smr.c	Tue Nov 15 22:46:56 2005 -0800
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  * Inter-Domain Network
@@ -603,7 +603,7 @@
 
 	if (len > IDN_DATA_SIZE) {
 		cmn_err(CE_WARN,
-			"IDN: 303: buffer len %d > IDN_DATA_SIZE (%d)",
+			"IDN: 303: buffer len %d > IDN_DATA_SIZE (%lu)",
 			len, IDN_DATA_SIZE);
 		IDN_GKSTAT_GLOBAL_EVENT(gk_buffail, gk_buffail_last);
 		return (EINVAL);
@@ -740,15 +740,14 @@
 	if (((uintptr_t)bufp & (IDN_SMR_BUFSIZE-1)) &&
 	    (IDN_ADDR2OFFSET(bufp) % IDN_SMR_BUFSIZE)) {
 		cmn_err(CE_WARN,
-			"IDN: 304: buffer (0x%x) from domain %d not on a "
-			"%d boundary", (uintptr_t)bufp, domid,
-			IDN_SMR_BUFSIZE);
+			"IDN: 304: buffer (0x%p) from domain %d not on a "
+			"%d boundary", bufp, domid, IDN_SMR_BUFSIZE);
 		goto bfdone;
 	}
 	if (!lockheld && (len > IDN_DATA_SIZE)) {
 		cmn_err(CE_WARN,
 			"IDN: 305: buffer length (%d) from domain %d greater "
-			"than IDN_DATA_SIZE (%d)",
+			"than IDN_DATA_SIZE (%lu)",
 			len, domid, IDN_DATA_SIZE);
 		goto bfdone;
 	}
@@ -830,7 +829,7 @@
 
 	if (!VALID_DOMAINID(domid)) {
 		cmn_err(CE_WARN,
-			"IDN: 307: domain ID (%d) invalid", proc, domid);
+			"IDN: 307: domain ID (%d) invalid", domid);
 		return (-1);
 	}
 
@@ -1269,8 +1268,8 @@
 
 	mutex_enter(&wp->w_mutex);
 
-	PR_SMR("%s: domain = %d, nwaiters = %d, wsp = 0x%x\n",
-		proc, domid, wp->w_nwaiters, (uint_t)wp->w_sp);
+	PR_SMR("%s: domain = %d, nwaiters = %d, wsp = 0x%p\n",
+		proc, domid, wp->w_nwaiters, wp->w_sp);
 
 	if (wp->w_nwaiters <= 0) {
 		/*
@@ -1362,11 +1361,10 @@
 
 	mutex_enter(&wp->w_mutex);
 
-	PR_SMR("%s: domain = %d, bufp = 0x%x, ebufp = 0x%x, "
-		"(f = %d, se = %d)\n",
-		proc, domid, (uint_t)(sp ? sp->sl_start : 0),
-		(uint_t)(sp ? sp->sl_end : 0),
-		forceflag, serrno);
+	PR_SMR("%s: domain = %d, bufp = 0x%p, ebufp = 0x%p, "
+		"(f = %d, se = %d)\n", proc, domid,
+		(sp ? sp->sl_start : 0),
+		(sp ? sp->sl_end : 0), forceflag, serrno);
 
 	if (wp->w_nwaiters <= 0) {
 		/*
@@ -1507,8 +1505,8 @@
 	int		nslabs;
 	procname_t	proc = "smr_slaballoc_get";
 
-	PR_SMR("%s: getting slab for domain %d [bufp=0x%x, ebufp=0x%x]\n",
-		proc, domid, (uintptr_t)bufp, (uint_t)ebufp);
+	PR_SMR("%s: getting slab for domain %d [bufp=0x%p, ebufp=0x%p]\n",
+		proc, domid, bufp, ebufp);
 
 	dp = &idn_domain[domid];
 
@@ -1555,10 +1553,9 @@
 		}
 
 		if (bufp && (ebufp > sp->sl_end)) {
-			PR_SMR("%s: bufp/ebufp (0x%x/0x%x) "
-				"expected (0x%x/0x%x)\n",
-				proc, (uintptr_t)bufp, (uintptr_t)ebufp,
-				(uintptr_t)sp->sl_start, (uintptr_t)sp->sl_end);
+			PR_SMR("%s: bufp/ebufp (0x%p/0x%p) "
+				"expected (0x%p/0x%p)\n", proc, bufp, ebufp,
+				sp->sl_start, sp->sl_end);
 			ASSERT(0);
 		}
 		/*
@@ -1887,8 +1884,8 @@
 			spa += s;
 		}
 
-		PR_SMR("%s: allocated slab 0x%x (start=0x%x, size=%d) for "
-			"domain %d\n", proc, (uint_t)spa, (uint_t)spa->sl_start,
+		PR_SMR("%s: allocated slab 0x%p (start=0x%p, size=%lu) for "
+			"domain %d\n", proc, spa, spa->sl_start,
 			spa->sl_end - spa->sl_start, domid);
 	} else {
 		PR_SMR("%s: FAILED to allocate for domain %d\n",
@@ -1945,8 +1942,8 @@
 
 		ATOMIC_INC(idn.slabpool->pool[p].nfree);
 
-		PR_SMR("%s: freed (bufp=0x%x) for domain %d\n",
-			proc, (uintptr_t)bufp, domid);
+		PR_SMR("%s: freed (bufp=0x%p) for domain %d\n",
+			proc, bufp, domid);
 
 		if (domid == idn.localid) {
 			/*
@@ -1969,8 +1966,8 @@
 		/*
 		 * Couldn't find slab entry for given buf!
 		 */
-		PR_SMR("%s: FAILED to free (bufp=0x%x) for domain %d\n",
-			proc, (uintptr_t)bufp, domid);
+		PR_SMR("%s: FAILED to free (bufp=0x%p) for domain %d\n",
+			proc, bufp, domid);
 	}
 }
 
@@ -2042,7 +2039,7 @@
 		int	diff, reap_per_domain;
 
 		PR_SMR("%s: kicking off reaping "
-			"(total_free = %d, min = %ld)\n",
+			"(total_free = %d, min = %d)\n",
 			proc, total_free, IDN_SLAB_THRESHOLD);
 
 		diff = IDN_SLAB_THRESHOLD - total_free;
@@ -2153,8 +2150,8 @@
 	procname_t	proc = "smr_remap";
 
 	if (va_to_pfn(vaddr) == new_pfn) {
-		PR_REMAP("%s: vaddr (0x%x) already mapped to pfn (0x%x)\n",
-			proc, (uint_t)vaddr, new_pfn);
+		PR_REMAP("%s: vaddr (0x%p) already mapped to pfn (0x%lx)\n",
+			proc, vaddr, new_pfn);
 		return;
 	}
 
@@ -2162,8 +2159,8 @@
 	npgs = btopr(blen);
 	ASSERT(npgs != 0);
 
-	PR_REMAP("%s: va = 0x%x, pfn = 0x%x, npgs = %ld, mb = %d MB (%ld)\n",
-		proc, (uint_t)vaddr, new_pfn, npgs, mblen, blen);
+	PR_REMAP("%s: va = 0x%p, pfn = 0x%lx, npgs = %ld, mb = %d MB (%ld)\n",
+		proc, vaddr, new_pfn, npgs, mblen, blen);
 
 	/*
 	 * Unmap the SMR virtual address from it's current
--- a/usr/src/uts/sun4u/starfire/io/memctrl.c	Tue Nov 15 22:21:35 2005 -0800
+++ b/usr/src/uts/sun4u/starfire/io/memctrl.c	Tue Nov 15 22:46:56 2005 -0800
@@ -191,8 +191,8 @@
 		seg_sz = mc_seg_table[i].seg_size;
 
 #ifdef DEBUG
-	printf("nodeid %x, mc asr addr %llx, val %x, seg_sz_mask %x, "
-	    "seg_sz %llx\n", nodeid, psi_addr, mcreg, seg_sz_mask, seg_sz);
+	printf("nodeid %x, mc asr addr %lx, val %x, seg_sz_mask %x, "
+	    "seg_sz %lx\n", nodeid, psi_addr, mcreg, seg_sz_mask, seg_sz);
 #endif /* DEBUG */
 
 	return (seg_sz - 1);
--- a/usr/src/uts/sun4u/starfire/sys/idn.h	Tue Nov 15 22:21:35 2005 -0800
+++ b/usr/src/uts/sun4u/starfire/sys/idn.h	Tue Nov 15 22:46:56 2005 -0800
@@ -376,8 +376,10 @@
 		(((caddr_t)(addr) >= idn.smr.vaddr) && \
 		VALID_NWROFFSET(((caddr_t)(addr) - idn.smr.vaddr), (align)))
 #define	VALID_DOMAINID(d)	(((d) >= 0) && ((d) < MAX_DOMAINS))
+#define	VALID_UDOMAINID(d)	((d) < MAX_DOMAINS)
 #define	VALID_CPUID(c)		(((c) >= 0) && ((c) < NCPU))
-#define	VALID_CHANNEL(c)	(((int)(c) >= 0) && ((int)(c) < IDN_MAX_NETS))
+#define	VALID_CHANNEL(c)	(((c) >= 0) && ((c) < IDN_MAX_NETS))
+#define	VALID_UCHANNEL(c)	((c) < IDN_MAX_NETS)
 
 /*
  * The following are bit values of idn_debug, currently
@@ -655,7 +657,7 @@
 		IDN_HISTORY_LOG(IDNH_GSTATE, (ns), 0, 0); \
 		tstamp = TIMESTAMP(); \
 		ASSERT(IDN_GLOCK_IS_EXCL()); \
-		PR_STATE("GSTATE:%lld: (l=%d) %s(%d) -> %s(%d)\n", \
+		PR_STATE("GSTATE:%ld: (l=%d) %s(%d) -> %s(%d)\n", \
 			(uint64_t)tstamp, __LINE__, \
 			idngs_str[idn.state], idn.state, \
 			idngs_str[ns], (ns)); \
@@ -1320,7 +1322,7 @@
 			hrtime_t	tstamp; \
 			tstamp = TIMESTAMP(); \
 			IDN_HISTORY_LOG(IDNH_FIN, _id, (ns), 0); \
-			PR_STATE("FSTATE:%lld:%d: (l=%d, b/p=%d/%d) " \
+			PR_STATE("FSTATE:%ld:%d: (l=%d, b/p=%d/%d) " \
 				"%s(%d) -> %s(%d)\n", \
 				(uint64_t)tstamp, _id, \
 				__LINE__, \
@@ -1490,7 +1492,7 @@
 		id = (dp)->domid; \
 		IDN_HISTORY_LOG(IDNH_DSTATE, id, (ns), \
 				(uint_t)(dp)->dcpu); \
-		PR_STATE("DSTATE:%lld:%d: (l=%d, b/p=%d/%d) " \
+		PR_STATE("DSTATE:%ld:%d: (l=%d, b/p=%d/%d) " \
 			"%s(%d) -> %s(%d)\n", \
 			(uint64_t)tstamp, id, \
 			__LINE__, \
@@ -3493,7 +3495,7 @@
 		idn_i2s_table[i] = (s); \
 	}
 
-#define	IDN_NETID2DOMID(n)	(VALID_DOMAINID((int)(n)) ? \
+#define	IDN_NETID2DOMID(n)	(VALID_UDOMAINID(n) ? \
 					((int)(n)) : IDN_NIL_DOMID)
 #define	IDN_DOMID2NETID(d)	((ushort_t)(d))