Changeset 04803bf in mainline for kernel/generic/src/printf/vprintf.c

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes (needs fixes).

File:

• kernel/generic/src/printf/vprintf.c (modified) (2 diffs)

kernel/generic/src/printf/vprintf.c

@@ -38 +38 @@
 #include <synch/spinlock.h>
 #include <arch/asm.h>
-#include <arch/types.h>
 #include <typedefs.h>
-#include <string.h>
+#include <typedefs.h>
+#include <str.h>
 
-SPINLOCK_STATIC_INITIALIZE_NAME(printf_lock, "*printf_lock");
+IRQ_SPINLOCK_STATIC_INITIALIZE_NAME(printf_lock, "*printf_lock");
 
 static int vprintf_str_write(const char *str, size_t size, void *data)
@@ -93 +93 @@
         };
         
-        ipl_t ipl = interrupts_disable();
-        spinlock_lock(&printf_lock);
-        
+        irq_spinlock_lock(&printf_lock, true);
         int ret = printf_core(fmt, &ps, ap);
-        
-        spinlock_unlock(&printf_lock);
-        interrupts_restore(ipl);
+        irq_spinlock_unlock(&printf_lock, true);
         
         return ret;