Changeset e6a78b9 in mainline for kernel/generic/src/ipc

Timestamp:

2012-06-29T15:31:44Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9432f08

Parents:

34ab31c0 (diff), 0bbd13e (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)
• sysipc.c (modified) (3 diffs)

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);

kernel/generic/src/ipc/sysipc.c

@@ -597 +597 @@
         if (IPC_GET_IMETHOD(call->data) == IPC_M_CONNECT_TO_ME) {
                 int phoneid = phone_alloc(TASK);
-                if (phoneid < 0) { /* Failed to allocate phone */
+                if (phoneid < 0) {  /* Failed to allocate phone */
                         IPC_SET_RETVAL(call->data, ELIMIT);
                         ipc_answer(box, call);
@@ -883 +883 @@
         
         /*
-         * Userspace is not allowed to change interface and method of system
+         * User space is not allowed to change interface and method of system
          * methods on forward, allow changing ARG1, ARG2, ARG3 and ARG4 by
-         * means of method, arg1, arg2 and arg3.
+         * means of imethod, arg1, arg2 and arg3.
          * If the interface and method is immutable, don't change anything.
          */
@@ -897 +897 @@
                         IPC_SET_ARG3(call->data, arg2);
                         
-                        if (slow) {
+                        if (slow)
                                 IPC_SET_ARG4(call->data, arg3);
-                                /*
-                                 * For system methods we deliberately don't
-                                 * overwrite ARG5.
-                                 */
-                        }
+                        
+                        /*
+                         * For system methods we deliberately don't
+                         * overwrite ARG5.
+                         */
                 } else {
                         IPC_SET_IMETHOD(call->data, imethod);