Changeset 973ef9fc in mainline for kernel/test/mm/falloc2.c

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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/test/mm/falloc2.c (modified) (2 diffs)

kernel/test/mm/falloc2.c

@@ -85 +85 @@
                                 for (k = 0; k <= (((size_t) FRAME_SIZE << order) - 1); k++) {
                                         if (((uint8_t *) frames[i])[k] != val) {
-                                                TPRINTF("Thread #%" PRIu64 " (cpu%u): Unexpected data (%c) in block %p offset %#" PRIs "\n", THREAD->tid, CPU->id, ((char *) frames[i])[k], frames[i], k);
+                                                TPRINTF("Thread #%" PRIu64 " (cpu%u): Unexpected data (%c) in block %p offset %zu\n",
+                                                    THREAD->tid, CPU->id, ((char *) frames[i])[k], frames[i], k);
                                                 atomic_inc(&thread_fail);
                                                 goto cleanup;
@@ -121 +122 @@
         
         while (atomic_get(&thread_count) > 0) {
-                TPRINTF("Threads left: %ld\n", atomic_get(&thread_count));
+                TPRINTF("Threads left: %" PRIua "\n", atomic_get(&thread_count));
                 thread_sleep(1);
         }