Changeset 30c4005 in mainline for kernel/generic/src/main/main.c

Timestamp:

2011-04-29T19:56:07Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

2874547

Parents:

6b40ea7 (diff), afdcc60e (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 improvements

File:

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

kernel/generic/src/main/main.c

@@ -223 +223 @@
         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();