Changeset 2b95d13 in mainline for kernel/generic

Timestamp:

2013-03-12T21:07:15Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

606f6a1

Parents:

976c434 (diff), eceff5f (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:

• interrupt/interrupt.c (modified) (2 diffs)
• main/kinit.c (modified) (1 diff)
• proc/task.c (modified) (1 diff)

kernel/generic/src/interrupt/interrupt.c

@@ -54 +54 @@
 #include <proc/thread.h>
 #include <arch/cycle.h>
+#include <arch/stack.h>
 #include <str.h>
 #include <trace.h>
@@ -222 +223 @@
         /*
          * The istate structure should be right at the bottom of the kernel
-         * stack.
+         * memory stack.
          */
-        return (istate_t *) ((uint8_t *)
-            thread->kstack + STACK_SIZE - sizeof(istate_t));
+        return (istate_t *) &thread->kstack[MEM_STACK_SIZE - sizeof(istate_t)];
 }
 

kernel/generic/src/main/kinit.c

@@ -250 +250 @@
                                     CAP_IO_MANAGER | CAP_IRQ_REG);
                                 
-                                if (!ipc_phone_0)
+                                if (!ipc_phone_0) {
                                         ipc_phone_0 = &programs[i].task->answerbox;
+                                        /*
+                                         * Hold the first task so that the
+                                         * ipc_phone_0 remains a valid pointer
+                                         * even if the first task exits for
+                                         * whatever reason.
+                                         */
+                                        task_hold(programs[i].task);
+                                }
                         }
                         

kernel/generic/src/proc/task.c

@@ -125 +125 @@
 {
         size_t tasks_left;
+
+        if (ipc_phone_0) {
+                task_t *task_0 = ipc_phone_0->task;
+                ipc_phone_0 = NULL;
+                /*
+                 * The first task is held by kinit(), we need to release it or
+                 * it will never finish cleanup.
+                 */
+                task_release(task_0);
+        }
         
         /* Repeat until there are any tasks except TASK */