Changeset 850235d in mainline for kernel/generic/src/main/kinit.c

Timestamp:

2013-03-10T14:56:21Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

05bab88

Parents:

ea906c29 (diff), 2277e03 (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/main/kinit.c (modified) (2 diffs)

kernel/generic/src/main/kinit.c

@@ -172 +172 @@
 #endif /* CONFIG_KCONSOLE */
         
+        /*
+         * Store the default stack size in sysinfo so that uspace can create
+         * stack with this default size.
+         */
+        sysinfo_set_item_val("default.stack_size", NULL, STACK_SIZE_USER);
+        
         interrupts_enable();
         
@@ -244 +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);
+                                }
                         }