Changeset 8b36bf2 in mainline for kernel/generic/src/ipc

Timestamp:

2012-06-20T23:03:29Z (14 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

d5070ef

Parents:

8375d0eb (diff), 6eef3c4 (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/ipc

Files:

• ipc.c (modified) (1 diff)
• kbox.c (modified) (1 diff)

kernel/generic/src/ipc/ipc.c

@@ -670 +670 @@
 void ipc_init(void)
 {
-        ipc_call_slab = slab_cache_create("ipc_call", sizeof(call_t), 0, NULL,
+        ipc_call_slab = slab_cache_create("call_t", sizeof(call_t), 0, NULL,
             NULL, 0);
-        ipc_answerbox_slab = slab_cache_create("ipc_answerbox",
+        ipc_answerbox_slab = slab_cache_create("answerbox_t",
             sizeof(answerbox_t), 0, NULL, NULL, 0);
 }

kernel/generic/src/ipc/kbox.c

@@ -244 +244 @@
         
         /* Create a kbox thread */
-        thread_t *kb_thread = thread_create(kbox_thread_proc, NULL, task, 0,
-            "kbox", false);
+        thread_t *kb_thread = thread_create(kbox_thread_proc, NULL, task,
+            THREAD_FLAG_NONE, "kbox");
         if (!kb_thread) {
                 mutex_unlock(&task->kb.cleanup_lock);