Changeset 0dc2fec in mainline for kernel/generic/src


Ignore:
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

Location:
kernel/generic/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/adt/cht.c

    r153c7a29 r0dc2fec  
    526526        ASSERT(op && op->hash && op->key_hash && op->equal && op->key_equal);
    527527        /* Memoized hashes are stored in the rcu_link.func function pointer. */
    528         ASSERT(sizeof(size_t) == sizeof(rcu_func_t));
     528        STATIC_ASSERT(sizeof(size_t) == sizeof(rcu_func_t));
    529529        ASSERT(sentinel.hash == (uintptr_t)sentinel.rcu_link.func);
    530530
     
    13111311                }
    13121312        } else {
    1313                 ASSERT(N_JOIN == N_JOIN_FOLLOWS);
     1313                STATIC_ASSERT(N_JOIN == N_JOIN_FOLLOWS);
    13141314               
    13151315                /* Keep the N_JOIN/N_JOIN_FOLLOWS mark but strip N_DELETED. */
  • kernel/generic/src/main/kinit.c

    r153c7a29 r0dc2fec  
    240240                        name = "<unknown>";
    241241               
    242                 ASSERT(TASK_NAME_BUFLEN >= INIT_PREFIX_LEN);
     242                STATIC_ASSERT(TASK_NAME_BUFLEN >= INIT_PREFIX_LEN);
    243243                str_cpy(namebuf, TASK_NAME_BUFLEN, INIT_PREFIX);
    244244                str_cpy(namebuf + INIT_PREFIX_LEN,
Note: See TracChangeset for help on using the changeset viewer.