x86: Don't turn off lock tracing in the console It is unnecessary. All callers already have the tracing disabled. And if we do want to turn it off further, the way to do that is to turn off the pcpui variable. Signed-off-by: Barret Rhoden <brho@cs.berkeley.edu>
diff --git a/kern/arch/x86/console.c b/kern/arch/x86/console.c index b1121f5..43118de 100644 --- a/kern/arch/x86/console.c +++ b/kern/arch/x86/console.c
@@ -652,13 +652,8 @@ void cons_putc(int c) { void logbuf(int c); - #ifdef CONFIG_TRACE_LOCKS - int8_t irq_state = 0; - disable_irqsave(&irq_state); - __spin_lock(&console_lock); - #else + spin_lock_irqsave(&console_lock); - #endif #ifndef CONFIG_SERIAL_IO serial_spam_char(c); @@ -667,12 +662,7 @@ cga_putc(c); logbuf(c); - #ifdef CONFIG_TRACE_LOCKS - __spin_unlock(&console_lock); - enable_irqsave(&irq_state); - #else spin_unlock_irqsave(&console_lock); - #endif } // `High'-level console I/O. Used by readline and cprintf.