Changeset 2b8b0ca in mainline for kernel/generic/src/mm/as.c

Timestamp:

2008-06-03T14:46:49Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

93a3348

Parents:

0f269c2

Message:

proper printf formatting

File:

• kernel/generic/src/mm/as.c (modified) (5 diffs)

kernel/generic/src/mm/as.c

@@ -454 +454 @@
                                         cond = false;   /* we are almost done */
                                         i = (start_free - b) >> PAGE_WIDTH;
-                                        if (!used_space_remove(area, start_free,
-                                            c - i))
-                                                panic("Could not remove used "
-                                                    "space.\n");
+                                        if (!used_space_remove(area, start_free, c - i))
+                                                panic("Could not remove used space.\n");
                                 } else {
                                         /*
@@ -464 +462 @@
                                          */
                                         if (!used_space_remove(area, b, c))
-                                                panic("Could not remove used "
-                                                    "space.\n");
+                                                panic("Could not remove used space.\n");
                                 }
                         
@@ -1529 +1526 @@
         }
 
-        panic("Inconsistency detected while adding %d pages of used space at "
+        panic("Inconsistency detected while adding %" PRIc " pages of used space at "
             "%p.\n", count, page);
 }
@@ -1708 +1705 @@
 
 error:
-        panic("Inconsistency detected while removing %d pages of used space "
+        panic("Inconsistency detected while removing %" PRIc " pages of used space "
             "from %p.\n", count, page);
 }
@@ -1801 +1798 @@
                 
                         mutex_lock(&area->lock);
-                        printf("as_area: %p, base=%p, pages=%d (%p - %p)\n",
+                        printf("as_area: %p, base=%p, pages=%" PRIc " (%p - %p)\n",
                             area, area->base, area->pages, area->base,
-                            area->base + area->pages*PAGE_SIZE);
+                            area->base + FRAMES2SIZE(area->pages));
                         mutex_unlock(&area->lock);
                 }