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

Timestamp:

2010-07-02T14:19:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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

@@ -1234 +1234 @@
 {
 #ifdef __32_BITS__
-        printf("#  base address frames       flags    free frames  busy frames\n");
-        printf("-- ------------ ------------ -------- ------------ ------------\n");
+        printf("[nr] [base addr] [frames    ] [flags ] [free frames ] [busy frames ]\n");
 #endif
 
 #ifdef __64_BITS__
-        printf("#  base address          frames      flags    free frames  busy frames\n");
-        printf("-- -------------------- ------------ -------- ------------ ------------\n");
+        printf("[nr] [base address    ] [frames    ] [flags ] [free frames ] [busy frames ]\n");
 #endif
         
@@ -1273 +1271 @@
                 bool available = zone_flags_available(flags);
                 
-                printf("%-2" PRIs, i);
+                printf("%-4" PRIs, i);
                 
 #ifdef __32_BITS__
-                printf("   %10p", base);
+                printf("  %10p", base);
 #endif
                 
 #ifdef __64_BITS__
-                printf("   %18p", base);
+                printf(" %18p", base);
 #endif
                 
@@ -1289 +1287 @@
                 
                 if (available)
-                        printf("%12" PRIs " %12" PRIs,
+                        printf("%14" PRIs " %14" PRIs,
                             free_count, busy_count);