X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fconsole%2Fprintk.c;h=75490881f6cf7221aa515636a7d6bcf4287c9e7f;hb=31324c64e12135f09590884421cbcbcabec1a62f;hp=3b1ae24ec18e3decae8c84a88af1b0da8e173043;hpb=52fc6b12cb458a93ba1eeac4082f4e7f574cdafc;p=coreboot.git

diff --git a/src/console/printk.c b/src/console/printk.c
index 3b1ae24ec..75490881f 100644
--- a/src/console/printk.c
+++ b/src/console/printk.c
@@ -5,25 +5,15 @@
  *
  */
 
-#include <stdarg.h>
 #include <smp/spinlock.h>
 #include <console/vtxprintf.h>
 #include <console/console.h>
-
-/* printk's without a loglevel use this.. */
-#define DEFAULT_MESSAGE_LOGLEVEL 4 /* BIOS_WARNING */
-
-/* We show everything that is MORE important than this.. */
-#define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */
-
-/* Keep together for sysctl support */
+#include <trace.h>
 
 int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL;
-int default_message_loglevel = DEFAULT_MESSAGE_LOGLEVEL;
-int minimum_console_loglevel = MINIMUM_CONSOLE_LOGLEVEL;
 int default_console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL;
 
-static spinlock_t console_lock = SPIN_LOCK_UNLOCKED;
+DECLARE_SPIN_LOCK(console_lock)
 
 int do_printk(int msg_level, const char *fmt, ...)
 {
@@ -34,6 +24,7 @@ int do_printk(int msg_level, const char *fmt, ...)
 		return 0;
 	}
 
+	DISABLE_TRACE;
 	spin_lock(&console_lock);
 
 	va_start(args, fmt);
@@ -43,6 +34,7 @@ int do_printk(int msg_level, const char *fmt, ...)
 	console_tx_flush();
 
 	spin_unlock(&console_lock);
+	ENABLE_TRACE;
 
 	return i;
 }