Changeset 0dc2fec in mainline for kernel/generic

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

Files:

• include/adt/list.h (modified) (2 diffs)
• src/adt/cht.c (modified) (2 diffs)
• src/main/kinit.c (modified) (1 diff)

kernel/generic/include/adt/list.h

@@ -76 +76 @@
 #define list_foreach(list, member, itype, iterator) \
         for (itype *iterator = NULL; iterator == NULL; iterator = (itype *) 1) \
-            for (link_t *_link = (list).head.next; \
-            iterator = list_get_instance(_link, itype, member), \
-            _link != &(list).head; _link = _link->next)
+                for (link_t *_link = (list).head.next; \
+                    iterator = list_get_instance(_link, itype, member), \
+                    _link != &(list).head; _link = _link->next)
 
 #define list_foreach_rev(list, member, itype, iterator) \
         for (itype *iterator = NULL; iterator == NULL; iterator = (itype *) 1) \
-            for (link_t *_link = (list).head.prev; \
-            iterator = list_get_instance(_link, itype, member), \
-            _link != &(list).head; _link = _link->prev)
+                for (link_t *_link = (list).head.prev; \
+                    iterator = list_get_instance(_link, itype, member), \
+                    _link != &(list).head; _link = _link->prev)
 
 /** Unlike list_foreach(), allows removing items while traversing a list.
@@ -113 +113 @@
 #define list_foreach_safe(list, iterator, next_iter) \
         for (link_t *iterator = (list).head.next, \
-                *next_iter = iterator->next; \
-                iterator != &(list).head; \
-                iterator = next_iter, next_iter = iterator->next)
+            *next_iter = iterator->next; \
+            iterator != &(list).head; \
+            iterator = next_iter, next_iter = iterator->next)
 
         

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. */

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,