Index: mount/usr/src/cmd/fs.d/ufs/fsck/main.c
===================================================================
--- mount.orig/usr/src/cmd/fs.d/ufs/fsck/main.c	2012-10-08 00:25:23.000000000 +0000
+++ mount/usr/src/cmd/fs.d/ufs/fsck/main.c	2013-02-11 02:47:48.164021995 +0000
@@ -496,7 +496,7 @@
 		while (limbo_dirs != NULL) {
 			limbo_victim = *(fsck_ino_t *)limbo_dirs;
 			if (limbo_victim != NULL) {
-				(void) tdelete((void *)limbo_victim,
+				(void) tdelete((void *)(uintptr_t)limbo_victim,
 				    &limbo_dirs,
 				    ino_t_cmp);
 			}
Index: mount/usr/src/cmd/fs.d/ufs/fsck/dir.c
===================================================================
--- mount.orig/usr/src/cmd/fs.d/ufs/fsck/dir.c	2012-10-08 00:25:23.000000000 +0000
+++ mount/usr/src/cmd/fs.d/ufs/fsck/dir.c	2013-02-11 02:48:44.054050183 +0000
@@ -629,7 +629,7 @@
 	 */
 noconnect:
 	if (lostdir) {
-		intree = tsearch((void *)orphan, &limbo_dirs,
+		intree = tsearch((void *)(uintptr_t)orphan, &limbo_dirs,
 		    ino_t_cmp);
 		if (intree == NULL)
 			errexit("linkup: out of memory");
@@ -739,7 +739,7 @@
 	 */
 noconnect:
 	if (lostdir) {
-		intree = tsearch((void *)orphan, &limbo_dirs,
+		intree = tsearch((void *)(uintptr_t)orphan, &limbo_dirs,
 		    ino_t_cmp);
 		if (intree == NULL)
 		errexit("linkup: out of memory");
Index: mount/usr/src/cmd/fs.d/ufs/fsck/pass1.c
===================================================================
--- mount.orig/usr/src/cmd/fs.d/ufs/fsck/pass1.c	2012-10-08 00:25:23.000000000 +0000
+++ mount/usr/src/cmd/fs.d/ufs/fsck/pass1.c	2013-02-11 02:49:14.698366044 +0000
@@ -483,7 +483,7 @@
 		statemap[inumber] = FCLEAR;
 	}
 	if (reply("CLEAR") == 1) {
-		(void) tdelete((void *)inumber, &limbo_dirs, ino_t_cmp);
+		(void) tdelete((void *)(uintptr_t)inumber, &limbo_dirs, ino_t_cmp);
 		freeino(inumber, TI_PARENT);
 		inodirty();
 	} else {
Index: mount/usr/src/cmd/fs.d/ufs/fsck/pass3.c
===================================================================
--- mount.orig/usr/src/cmd/fs.d/ufs/fsck/pass3.c	2012-10-08 00:25:23.000000000 +0000
+++ mount/usr/src/cmd/fs.d/ufs/fsck/pass3.c	2013-02-11 02:51:02.457349593 +0000
@@ -229,7 +229,7 @@
 			 * != orphan, since there's no dynamic memory
 			 * to free here.
 			 */
-			if (tsearch((void *)orphan, &limbo_dirs,
+			if (tsearch((void *)(uintptr_t)orphan, &limbo_dirs,
 				    ino_t_cmp) == NULL)
 				errexit("out of memory");
 			statemap[orphan] |= INORPHAN;
Index: mount/usr/src/cmd/fs.d/ufs/fsck/utilities.c
===================================================================
--- mount.orig/usr/src/cmd/fs.d/ufs/fsck/utilities.c	2012-10-08 00:25:23.000000000 +0000
+++ mount/usr/src/cmd/fs.d/ufs/fsck/utilities.c	2013-02-11 02:55:37.858542000 +0000
@@ -29,7 +29,6 @@
 #include <unistd.h>
 #include <stdarg.h>
 #include <libadm.h>
-#include <note.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/mntent.h>
@@ -117,7 +116,6 @@
 	return (0);
 }
 
-NOTE(PRINTFLIKE(1))
 int
 reply(caddr_t fmt, ...)
 {
@@ -833,7 +831,6 @@
 /*
  * determine whether an inode should be fixed.
  */
-NOTE(PRINTFLIKE(2))
 int
 dofix(struct inodesc *idesc, caddr_t msg, ...)
 {
@@ -877,7 +874,6 @@
 	return (rval);
 }
 
-NOTE(PRINTFLIKE(1))
 void
 errexit(caddr_t fmt, ...)
 {
@@ -888,7 +884,6 @@
 	/* NOTREACHED */
 }
 
-NOTE(PRINTFLIKE(1))
 static void
 verrexit(caddr_t fmt, va_list ap)
 {
@@ -919,7 +914,6 @@
  * An unexpected inconsistency occured.
  * Die if preening, otherwise just print message and continue.
  */
-NOTE(PRINTFLIKE(1))
 void
 pfatal(caddr_t fmt, ...)
 {
@@ -930,7 +924,6 @@
 	va_end(ap);
 }
 
-NOTE(PRINTFLIKE(1))
 static void
 vpfatal(caddr_t fmt, va_list ap)
 {
@@ -966,7 +959,6 @@
  * Pwarn just prints a message when not preening,
  * or a warning (preceded by filename) when preening.
  */
-NOTE(PRINTFLIKE(1))
 void
 pwarn(caddr_t fmt, ...)
 {
@@ -977,7 +969,6 @@
 	va_end(ap);
 }
 
-NOTE(PRINTFLIKE(1))
 static void
 vpwarn(caddr_t fmt, va_list ap)
 {
@@ -997,7 +988,6 @@
  *
  * Solaris doesn't have asprintf(3C) yet, unfortunately.
  */
-NOTE(PRINTFLIKE(2))
 int
 fsck_asprintf(caddr_t *ret, caddr_t fmt, ...)
 {
@@ -2290,8 +2280,8 @@
 int
 ino_t_cmp(const void *left, const void *right)
 {
-	const fsck_ino_t lino = (const fsck_ino_t)left;
-	const fsck_ino_t rino = (const fsck_ino_t)right;
+	const fsck_ino_t lino = (const fsck_ino_t)(uintptr_t)left;
+	const fsck_ino_t rino = (const fsck_ino_t)(uintptr_t)right;
 
 	return (lino - rino);
 }
@@ -2628,7 +2618,7 @@
 void
 add_orphan_dir(fsck_ino_t ino)
 {
-	if (tsearch((void *)ino, &limbo_dirs, ino_t_cmp) == NULL)
+	if (tsearch((void *)(uintptr_t)ino, &limbo_dirs, ino_t_cmp) == NULL)
 		errexit("add_orphan_dir: out of memory");
 }
 
@@ -2639,7 +2629,7 @@
 void
 remove_orphan_dir(fsck_ino_t ino)
 {
-	(void) tdelete((void *)ino, &limbo_dirs, ino_t_cmp);
+	(void) tdelete((void *)(uintptr_t)ino, &limbo_dirs, ino_t_cmp);
 }
 
 /*