Changeset 0dc2fec in mainline for kernel/generic/src/main/kinit.c

Timestamp:

2016-05-22T19:19:43Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b272c67a

Parents:

153c7a29 (diff), af2254ec (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/main/kinit.c (modified) (1 diff)

kernel/generic/src/main/kinit.c

@@ -240 +240 @@
                         name = "<unknown>";
                 
-                ASSERT(TASK_NAME_BUFLEN >= INIT_PREFIX_LEN);
+                STATIC_ASSERT(TASK_NAME_BUFLEN >= INIT_PREFIX_LEN);
                 str_cpy(namebuf, TASK_NAME_BUFLEN, INIT_PREFIX);
                 str_cpy(namebuf + INIT_PREFIX_LEN,