Changeset 96cd5b4 in mainline for kernel/generic/src/main/main.c

Timestamp:

2012-01-04T13:37:10Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

9957a97

Parents:

ecf823a (diff), c520034 (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 with mainline

File:

• kernel/generic/src/main/main.c (modified) (4 diffs)

kernel/generic/src/main/main.c

@@ -68 +68 @@
 #include <mm/page.h>
 #include <genarch/mm/page_pt.h>
+#include <mm/km.h>
 #include <mm/tlb.h>
 #include <mm/as.h>
@@ -86 +87 @@
 #include <sysinfo/sysinfo.h>
 #include <sysinfo/stats.h>
+#include <lib/ra.h>
 
 /** Global configuration structure. */
-config_t config;
+config_t config = {
+        .identity_configured = false,
+        .non_identity_configured = false,
+        .physmem_end = 0
+};
 
 /** Initial user-space tasks */
@@ -205 +211 @@
          */
         arch_pre_mm_init();
+        km_identity_init();
         frame_init();
-        
-        /* Initialize at least 1 memory segment big enough for slab to work. */
         slab_cache_init();
+        ra_init();      
         sysinfo_init();
         btree_init();
@@ -214 +220 @@
         page_init();
         tlb_init();
+        km_non_identity_init();
         ddi_init();
         arch_post_mm_init();