From 16357dea6b5158b8ea97e0a7f9f19b026e372473 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 3 Aug 2009 11:54:25 +0000 Subject: [PATCH] Don't lock when the debugger is running. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32072 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/kernel/arch/x86/arch_debug_console.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/system/kernel/arch/x86/arch_debug_console.c b/src/system/kernel/arch/x86/arch_debug_console.c index 1c5a947f4f..cf782c106d 100644 --- a/src/system/kernel/arch/x86/arch_debug_console.c +++ b/src/system/kernel/arch/x86/arch_debug_console.c @@ -344,13 +344,18 @@ _arch_debug_serial_putchar(const char c) void arch_debug_serial_putchar(const char c) { - cpu_status state = disable_interrupts(); - acquire_spinlock(&sSerialOutputSpinlock); + cpu_status state = 0; + if (!debug_debugger_running()) { + state = disable_interrupts(); + acquire_spinlock(&sSerialOutputSpinlock); + } _arch_debug_serial_putchar(c); - release_spinlock(&sSerialOutputSpinlock); - restore_interrupts(state); + if (!debug_debugger_running()) { + release_spinlock(&sSerialOutputSpinlock); + restore_interrupts(state); + } }