Changeset d61c3a7 in mainline for kernel/generic/src/mm/frame.c

Timestamp:

2011-05-15T14:44:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8d308b9

Parents:

010be476 (diff), e0f52bf (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/mm/frame.c (modified) (3 diffs)

kernel/generic/src/mm/frame.c

@@ -60 +60 @@
 #include <macros.h>
 #include <config.h>
+#include <str.h>
 
 zones_t zones;
@@ -1395 +1396 @@
         bool available = zone_flags_available(flags);
         
+        uint64_t size;
+        const char *size_suffix;
+        bin_order_suffix(FRAMES2SIZE(count), &size, &size_suffix, false);
+        
         printf("Zone number:       %zu\n", znum);
         printf("Zone base address: %p\n", (void *) base);
-        printf("Zone size:         %zu frames (%zu KiB)\n", count,
-            SIZE2KB(FRAMES2SIZE(count)));
+        printf("Zone size:         %zu frames (%" PRIu64 " %s)\n", count,
+            size, size_suffix);
         printf("Zone flags:        %c%c%c\n",
             available ? 'A' : ' ',
@@ -1405 +1410 @@
         
         if (available) {
-                printf("Allocated space:   %zu frames (%zu KiB)\n",
-                    busy_count, SIZE2KB(FRAMES2SIZE(busy_count)));
-                printf("Available space:   %zu frames (%zu KiB)\n",
-                    free_count, SIZE2KB(FRAMES2SIZE(free_count)));
+                bin_order_suffix(FRAMES2SIZE(busy_count), &size, &size_suffix,
+                    false);
+                printf("Allocated space:   %zu frames (%" PRIu64 " %s)\n",
+                    busy_count, size, size_suffix);
+                bin_order_suffix(FRAMES2SIZE(free_count), &size, &size_suffix,
+                    false);
+                printf("Available space:   %zu frames (%" PRIu64 " %s)\n",
+                    free_count, size, size_suffix);
         }
 }