Index: kernel/generic/src/synch/rwlock.c
===================================================================
--- kernel/generic/src/synch/rwlock.c	(revision 83512f218dedeb9823a83908ea76dbed9da915bd)
+++ kernel/generic/src/synch/rwlock.c	(revision aac10f86e541e3924e4795fd3ab0341b0280a144)
@@ -232,5 +232,5 @@
 			break;
 		case ESYNCH_OK_ATOMIC:
-			panic("_mutex_lock_timeout()==ESYNCH_OK_ATOMIC\n");
+			panic("_mutex_lock_timeout() == ESYNCH_OK_ATOMIC\n");
 			break;
 		default:
Index: kernel/generic/src/synch/spinlock.c
===================================================================
--- kernel/generic/src/synch/spinlock.c	(revision 83512f218dedeb9823a83908ea76dbed9da915bd)
+++ kernel/generic/src/synch/spinlock.c	(revision aac10f86e541e3924e4795fd3ab0341b0280a144)
@@ -107,7 +107,6 @@
 #endif
 		if (i++ > DEADLOCK_THRESHOLD) {
-			printf("cpu%d: looping on spinlock %.*p:%s, "
-			    "caller=%.*p", CPU->id, sizeof(uintptr_t) * 2, sl,
-			    sl->name, sizeof(uintptr_t) * 2, CALLER);
+			printf("cpu%u: looping on spinlock %" PRIp ":%s, caller=%" PRIp,
+				CPU->id, sl, sl->name, CALLER);
 			symbol = get_symtab_entry(CALLER);
 			if (symbol)
@@ -120,5 +119,5 @@
 
 	if (deadlock_reported)
-		printf("cpu%d: not deadlocked\n", CPU->id);
+		printf("cpu%u: not deadlocked\n", CPU->id);
 
 	/*