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

Timestamp:

2010-06-29T17:43:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6473d41

Parents:

e4a4b44 (diff), 793cf029 (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 mainlnie changes.

File:

• kernel/generic/src/mm/frame.c (modified) (2 diffs)

kernel/generic/src/mm/frame.c

@@ -1234 +1234 @@
 {
 #ifdef __32_BITS__
-        printf("[nr] [base addr ] [frames    ] [flags ] [free frames ] [busy frames ]\n");
+        printf("[nr] [base addr] [frames    ] [flags ] [free frames ] [busy frames ]\n");
 #endif
 
 #ifdef __64_BITS__
-        printf("[nr] [base address      ] [frames    ] [flags ] [free frames ] [busy frames ]\n");
+        printf("[nr] [base address    ] [frames    ] [flags ] [free frames ] [busy frames ]\n");
 #endif
         
@@ -1274 +1274 @@
                 
 #ifdef __32_BITS__
-                printf("   %10p", base);
+                printf("  %10p", base);
 #endif
                 
 #ifdef __64_BITS__
-                printf("   %18p", base);
+                printf(" %18p", base);
 #endif