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

Timestamp:

2010-11-26T14:19:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b12d3cc

Parents:

03171de (diff), ffdd2b9 (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

Local changes: removed extra parameters to printf (variables
that would be ignored anyway).

File:

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

kernel/generic/src/mm/as.c

@@ -1811 +1811 @@
         }
         
-        panic("Inconsistency detected while adding %" PRIs " pages of used "
-            "space at %p.", count, page);
+        panic("Inconsistency detected while adding %zu pages of used "
+            "space at %p.", count, (void *) page);
 }
 
@@ -1991 +1991 @@
         
 error:
-        panic("Inconsistency detected while removing %" PRIs " pages of used "
-            "space from %p.", count, page);
+        panic("Inconsistency detected while removing %zu pages of used "
+            "space from %p.", count, (void *) page);
 }
 
@@ -2105 +2105 @@
                         
                         mutex_lock(&area->lock);
-                        printf("as_area: %p, base=%p, pages=%" PRIs
-                            " (%p - %p)\n", area, area->base, area->pages,
-                            area->base, area->base + FRAMES2SIZE(area->pages));
+                        printf("as_area: %p, base=%p, pages=%zu"
+                            " (%p - %p)\n", area, (void *) area->base,
+                            area->pages, (void *) area->base,
+                            (void *) (area->base + FRAMES2SIZE(area->pages)));
                         mutex_unlock(&area->lock);
                 }