Changeset 4fe3b6d in mainline for kernel/generic/src/main/main.c

Timestamp:

2011-05-20T11:07:00Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

8bb61e6

Parents:

3476be8 (diff), 7941bd6 (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 development

File:

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

kernel/generic/src/main/main.c

@@ -71 +71 @@
 #include <mm/as.h>
 #include <mm/slab.h>
+#include <mm/reserve.h>
 #include <synch/waitq.h>
 #include <synch/futex.h>
@@ -217 +218 @@
         ddi_init();
         arch_post_mm_init();
+        reserve_init();
         arch_pre_smp_init();
         smp_init();
@@ -223 +225 @@
         slab_enable_cpucache();
         
-        printf("Detected %u CPU(s), %" PRIu64 " MiB free memory\n",
-            config.cpu_count, SIZE2MB(zones_total_size()));
+        uint64_t size;
+        const char *size_suffix;
+        bin_order_suffix(zones_total_size(), &size, &size_suffix, false);
+        printf("Detected %u CPU(s), %" PRIu64 " %s free memory\n",
+            config.cpu_count, size, size_suffix);
         
         cpu_init();