Changeset f4f866c in mainline for kernel/generic/src/main/main.c

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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/main.c (modified) (4 diffs)

kernel/generic/src/main/main.c

@@ -84 +84 @@
 #include <main/main.h>
 #include <ipc/event.h>
+#include <sysinfo/sysinfo.h>
+#include <sysinfo/stats.h>
 
 /** Global configuration structure. */
@@ -209 +211 @@
         /* Initialize at least 1 memory segment big enough for slab to work. */
         LOG_EXEC(slab_cache_init());
+        LOG_EXEC(sysinfo_init());
         LOG_EXEC(btree_init());
         LOG_EXEC(as_init());
@@ -223 +226 @@
         
         printf("Detected %" PRIs " CPU(s), %" PRIu64" MiB free memory\n",
-            config.cpu_count, SIZE2MB(zone_total_size()));
-        
+            config.cpu_count, SIZE2MB(zones_total_size()));
+
         LOG_EXEC(cpu_init());
         
@@ -247 +250 @@
         LOG_EXEC(event_init());
         LOG_EXEC(klog_init());
+        LOG_EXEC(stats_init());
         
         /*