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

Timestamp:

2011-05-31T22:58:56Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d362410

Parents:

82582e4 (diff), 4ce90544 (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.

File:

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

kernel/generic/src/printf/vprintf.c

@@ -41 +41 @@
 #include <typedefs.h>
 #include <str.h>
-
-IRQ_SPINLOCK_STATIC_INITIALIZE_NAME(printf_lock, "*printf_lock");
 
 static int vprintf_str_write(const char *str, size_t size, void *data)
@@ -93 +91 @@
         };
         
-        irq_spinlock_lock(&printf_lock, true);
-        int ret = printf_core(fmt, &ps, ap);
-        irq_spinlock_unlock(&printf_lock, true);
-        
-        return ret;
+        return printf_core(fmt, &ps, ap);
 }