From 73b118b6332cb8f9d0558f34d240bc6d7726f5b1 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 4 Apr 2009 21:57:07 +0000 Subject: [PATCH] bonefish + mmlr: Check gKernelStartup to avoid sending ICI when entering the kernel debugger (after ICI is enabled). Moreover it's more obvious than to use that instead of relying on ICIs not being enabled. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29907 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/kernel/debug/debug.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/system/kernel/debug/debug.cpp b/src/system/kernel/debug/debug.cpp index 5fd140494e..92ba0579a0 100644 --- a/src/system/kernel/debug/debug.cpp +++ b/src/system/kernel/debug/debug.cpp @@ -743,7 +743,8 @@ enter_kernel_debugger(const char* message) arch_debug_save_registers(&dbg_register_file[smp_get_current_cpu()][0]); sPreviousDprintfState = set_dprintf_enabled(true); - if (sDebuggerOnCPU != smp_get_current_cpu() && smp_get_num_cpus() > 1) { + if (!gKernelStartup && sDebuggerOnCPU != smp_get_current_cpu() + && smp_get_num_cpus() > 1) { // First entry on a MP system, send a halt request to all of the other // CPUs. Should they try to enter the debugger they will be cought in // the loop above.