Changeset 97c7682 in mainline for kernel/generic/src/main/main.c

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• kernel/generic/src/main/main.c (modified) (1 diff)

kernel/generic/src/main/main.c

@@ -276 +276 @@
          * Create the first thread.
          */
-        thread_t *kinit_thread =
-            thread_create(kinit, NULL, kernel, 0, "kinit", true);
+        thread_t *kinit_thread = thread_create(kinit, NULL, kernel,
+            THREAD_FLAG_UNCOUNTED, "kinit");
         if (!kinit_thread)
                 panic("Cannot create kinit thread.");