Changeset 46c20c8 in mainline for kernel/test/synch/semaphore2.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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/test/synch/semaphore2.c (modified) (2 diffs)

kernel/test/synch/semaphore2.c

@@ -32 +32 @@
 #include <print.h>
 #include <proc/thread.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/context.h>
 
@@ -82 +82 @@
 }
 
-char *test_semaphore2(void)
+const char *test_semaphore2(void)
 {
         uint32_t i, k;