Index: kernel/generic/include/panic.h
===================================================================
--- kernel/generic/include/panic.h	(revision a5c8647825afce81b32431861b51b62dae562f7c)
+++ kernel/generic/include/panic.h	(revision 49924b42f8a1f6ddb02eebdcaf4e2c6e6875726d)
@@ -36,8 +36,16 @@
 #define KERN_PANIC_H_
 
+#include <stacktrace.h>
+#include <print.h>
+
 #ifdef CONFIG_DEBUG
 #	define panic(format, ...) \
-		panic_printf("Kernel panic in %s() at %s:%u: " format "\n", \
-		__func__, __FILE__, __LINE__, ##__VA_ARGS__);
+		do { \
+			printf("Kernel panic in %s() at %s:%u.\n", \
+			    __func__, __FILE__, __LINE__); \
+			stack_trace(); \
+			panic_printf("Panic message: " format "\n", \
+			    ##__VA_ARGS__);\
+		} while (0)
 #else
 #	define panic(format, ...) \