diff --git a/kern/drivers/dev/cons.c b/kern/drivers/dev/cons.c
index 1a9ce3d..ffa0df2 100644
--- a/kern/drivers/dev/cons.c
+++ b/kern/drivers/dev/cons.c
@@ -1217,9 +1217,9 @@
 
 		case Qstdout:
 		case Qstderr:
-			px_lock();
+			print_lock();
 			if (waserror()) {
-				px_unlock();
+				print_unlock();
 				nexterror();
 			}
 			/* TODO: tty hack.  they are sending us an escape sequence, and the
@@ -1231,7 +1231,7 @@
 				cputbuf(va, n);
 			}
 			poperror();
-			px_unlock();
+			print_unlock();
 			return n;
 		case Qsysname:
 			/* TODO: this is racy */
diff --git a/kern/include/kdebug.h b/kern/include/kdebug.h
index 7b482aa..cde8b96 100644
--- a/kern/include/kdebug.h
+++ b/kern/include/kdebug.h
@@ -79,6 +79,3 @@
 
 void debug_addr_proc(struct proc *p, unsigned long addr);
 void debug_addr_pid(int pid, unsigned long addr);
-
-void px_lock(void);
-void px_unlock(void);
diff --git a/kern/src/init.c b/kern/src/init.c
index 60c64a7..858a74f 100644
--- a/kern/src/init.c
+++ b/kern/src/init.c
@@ -253,7 +253,7 @@
 	PERCPU_VAR(panic_depth)++;
 
 	va_start(ap, fmt);
-	printk("kernel panic at %s:%d, from core %d: ", file, line,
+	printk("\nkernel panic at %s:%d, from core %d: ", file, line,
 	       core_id_early());
 	vcprintf(fmt, ap);
 	printk("\n");
@@ -315,7 +315,7 @@
 
 	print_lock();
 	va_start(ap, fmt);
-	printk("kernel warning at %s:%d, from core %d: ", file, line,
+	printk("\nkernel warning at %s:%d, from core %d: ", file, line,
 	       core_id_early());
 	vcprintf(fmt, ap);
 	cprintf("\n");
diff --git a/kern/src/kdebug.c b/kern/src/kdebug.c
index 9841484..c1c598b 100644
--- a/kern/src/kdebug.c
+++ b/kern/src/kdebug.c
@@ -278,15 +278,3 @@
 	if (current)
 		backtrace_user_ctx(current, current_ctx);
 }
-
-static spinlock_t __px_lock = SPINLOCK_INITIALIZER_IRQSAVE;
-void px_lock(void)
-{
-	if (printx_on)
-		spin_lock_irqsave(&__px_lock);
-}
-void px_unlock(void)
-{
-	if (printx_on)
-		spin_unlock_irqsave(&__px_lock);
-}