X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=KernelLand%2FKernel%2Fdebug.c;h=f0d21fa7d7f396e4a8618c29540709aad486c162;hb=733cd5c013a1a67eca03b158a257e0fb18b9545e;hp=cb11f5f5fb9dcf530dff561aaf96a6c281ae18f9;hpb=a01b96ccf4ec884e5b894d08a819a37ea3f5f749;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/debug.c b/KernelLand/Kernel/debug.c
index cb11f5f5..f0d21fa7 100644
--- a/KernelLand/Kernel/debug.c
+++ b/KernelLand/Kernel/debug.c
@@ -11,6 +11,7 @@
 
 // === IMPORTS ===
 extern void	Threads_Dump(void);
+extern void	Heap_Dump(void);
 extern void	KernelPanic_SetMode(void);
 extern void	KernelPanic_PutChar(char Ch);
 extern void	IPStack_SendDebugText(const char *Text);
@@ -150,7 +151,7 @@ void Debug(const char *Fmt, ...)
 	va_list	args;
 	
 	#if LOCK_DEBUG_OUTPUT
-	SHORTLOCK(&glDebug_Lock);
+	if(!CPU_HAS_LOCK(&glDebug_Lock)) SHORTLOCK(&glDebug_Lock);
 	#endif
 
 	Debug_Puts(0, "Debug: ");
@@ -228,7 +229,8 @@ void Panic(const char *Fmt, ...)
 	va_list	args;
 	
 	#if LOCK_DEBUG_OUTPUT
-	SHORTLOCK(&glDebug_Lock);
+	if( !CPU_HAS_LOCK(&glDebug_Lock) )
+		SHORTLOCK(&glDebug_Lock);
 	#endif
 	// And never SHORTREL