Changeset 0dc2fec in mainline for kernel/generic/src/adt/cht.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/adt/cht.c (modified) (2 diffs)

kernel/generic/src/adt/cht.c

@@ -526 +526 @@
         ASSERT(op && op->hash && op->key_hash && op->equal && op->key_equal);
         /* Memoized hashes are stored in the rcu_link.func function pointer. */
-        ASSERT(sizeof(size_t) == sizeof(rcu_func_t));
+        STATIC_ASSERT(sizeof(size_t) == sizeof(rcu_func_t));
         ASSERT(sentinel.hash == (uintptr_t)sentinel.rcu_link.func);
 
@@ -1311 +1311 @@
                 }
         } else {
-                ASSERT(N_JOIN == N_JOIN_FOLLOWS);
+                STATIC_ASSERT(N_JOIN == N_JOIN_FOLLOWS);
                 
                 /* Keep the N_JOIN/N_JOIN_FOLLOWS mark but strip N_DELETED. */