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

Timestamp:

2010-12-02T17:21:30Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

3bd76491

Parents:

8ad673a (diff), 41a7f62 (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 from mainline

File:

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

kernel/generic/src/mm/frame.c

@@ -145 +145 @@
                             (!iswithin(zones.info[i].base, zones.info[i].count,
                             base, count))) {
-                                printf("Zone (%p, %p) overlaps with previous zone (%p, %p)!\n",
-                                    PFN2ADDR(base), PFN2ADDR(count),
-                                    PFN2ADDR(zones.info[i].base),
-                                    PFN2ADDR(zones.info[i].count));
+                                printf("Zone (%p, %p) overlaps "
+                                    "with previous zone (%p %p)!\n",
+                                    (void *) PFN2ADDR(base), (void *) PFN2ADDR(count),
+                                    (void *) PFN2ADDR(zones.info[i].base),
+                                    (void *) PFN2ADDR(zones.info[i].count));
                         }
                         
@@ -1049 +1050 @@
                 
 #ifdef CONFIG_DEBUG
-                printf("Thread %" PRIu64 " waiting for %" PRIs " frames, "
-                    "%" PRIs " available.\n", THREAD->tid, size, avail);
+                printf("Thread %" PRIu64 " waiting for %zu frames, "
+                    "%zu available.\n", THREAD->tid, size, avail);
 #endif
                 
@@ -1297 +1298 @@
                 bool available = zone_flags_available(flags);
                 
-                printf("%-4" PRIs, i);
+                printf("%-4zu", i);
                 
 #ifdef __32_BITS__
-                printf("  %10p", base);
+                printf("  %p", (void *) base);
 #endif
                 
 #ifdef __64_BITS__
-                printf(" %18p", base);
+                printf(" %p", (void *) base);
 #endif
                 
-                printf(" %12" PRIs " %c%c%c      ", count,
+                printf(" %12zu %c%c%c      ", count,
                     available ? 'A' : ' ',
                     (flags & ZONE_RESERVED) ? 'R' : ' ',
@@ -1313 +1314 @@
                 
                 if (available)
-                        printf("%14" PRIs " %14" PRIs,
+                        printf("%14zu %14zu",
                             free_count, busy_count);
                 
@@ -1354 +1355 @@
         bool available = zone_flags_available(flags);
         
-        printf("Zone number:       %" PRIs "\n", znum);
-        printf("Zone base address: %p\n", base);
-        printf("Zone size:         %" PRIs " frames (%" PRIs " KiB)\n", count,
+        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 flags:        %c%c%c\n",
@@ -1364 +1365 @@
         
         if (available) {
-                printf("Allocated space:   %" PRIs " frames (%" PRIs " KiB)\n",
+                printf("Allocated space:   %zu frames (%zu KiB)\n",
                     busy_count, SIZE2KB(FRAMES2SIZE(busy_count)));
-                printf("Available space:   %" PRIs " frames (%" PRIs " KiB)\n",
+                printf("Available space:   %zu frames (%zu KiB)\n",
                     free_count, SIZE2KB(FRAMES2SIZE(free_count)));
         }