1 files changed, 8 insertions, 3 deletions

diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 714e744ae57d..3bd35d46160a 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -507,11 +507,16 @@ panic(const char *fmt, ...)
 	}
 
 	va_start(ap, fmt);
-	(void)vsnprintf(buf, sizeof(buf), fmt, ap);
-	if (panicstr == fmt)
+	if (newpanic) {
+		(void)vsnprintf(buf, sizeof(buf), fmt, ap);
 		panicstr = buf;
+		printf("panic: %s\n", buf);
+	} else {
+		printf("panic: ");
+		vprintf(fmt, ap);
+		printf("\n");
+	}
 	va_end(ap);
-	printf("panic: %s\n", buf);
 #ifdef SMP
 	/* two separate prints in case of an unmapped page and trap */
 	printf("cpuid = %d; ", PCPU_GET(cpuid));