X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/de355530ae67247cbd0da700edb3a2a1dae884c2..5eebf7385fedb1517b66b53c28e5aa6bb0a2be50:/osfmk/kern/debug.c

diff --git a/osfmk/kern/debug.c b/osfmk/kern/debug.c
index 7793cb8c2..5fedc28cc 100644
--- a/osfmk/kern/debug.c
+++ b/osfmk/kern/debug.c
@@ -76,16 +76,16 @@ unsigned int	active_debugger = 0;
 unsigned int	debug_mode=0;
 unsigned int 	disableDebugOuput = TRUE;
 unsigned int 	systemLogDiags = FALSE;
-unsigned int 	panicDebugging = FALSE;
+unsigned int    logPanicDataToScreen = FALSE;
 #ifdef __ppc__
-	unsigned int	logPanicDataToScreen = FALSE;
+        unsigned int 	panicDebugging = FALSE;
 #else
-	unsigned int	logPanicDataToScreen = TRUE;
+        unsigned int 	panicDebugging = TRUE;
 #endif
 
 int mach_assert = 1;
 
-const char		*panicstr;
+const char		*panicstr = (char *) 0;
 decl_simple_lock_data(,panic_lock)
 int			paniccpu;
 volatile int		panicwait;
@@ -145,6 +145,7 @@ panic(const char *str, ...)
 	thread_t thread;
 
 	s = splhigh();
+	disable_preemption();
 
 #ifdef	__ppc__
 	lastTrace = LLTraceSet(0);		/* Disable low-level tracing */
@@ -154,8 +155,6 @@ panic(const char *str, ...)
 	save_waits[cpu_number()] = thread->wait_queue;	/* Save the old value */
 	thread->wait_queue = 0;			/* Clear the wait so we do not get double panics when we try locks */
 
-	mp_disable_preemption();
-	
 	if( logPanicDataToScreen )
 		disableDebugOuput = FALSE;
 		
@@ -176,8 +175,6 @@ restart:
 			nestedpanic +=1;
 			PANIC_UNLOCK();
 			Debugger("double panic");
-			mp_enable_preemption();
-			splx(s);
 			printf("double panic:  We are hanging here...\n");
 			while(1);
 			/* NOTREACHED */
@@ -205,11 +202,12 @@ restart:
 	PANIC_LOCK();
 	panicstr = (char *)0;
 	PANIC_UNLOCK();
-	mp_enable_preemption();
-	splx(s);
 	thread->wait_queue = save_waits[cpu_number()]; 	/* Restore the wait queue */
-	if (return_on_panic)
+	if (return_on_panic) {
+		enable_preemption();
+		splx(s);
 		return;
+	}
 	kdb_printf("panic: We are hanging here...\n");
 	while(1);
 	/* NOTREACHED */