Changeset 7bdcc45 in mainline for kernel/test/mm/falloc1.c

Timestamp:

2010-12-16T16:38:49Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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/falloc1.c (modified) (1 diff)

kernel/test/mm/falloc1.c

@@ -64 +64 @@
                                 
                                 if (ALIGN_UP(frames[allocated], FRAME_SIZE << order) != frames[allocated]) {
-                                        TPRINTF("Block at address %p (size %dK) is not aligned\n", frames[allocated], (FRAME_SIZE << order) >> 10);
+                                        TPRINTF("Block at address %p (size %dK) is not aligned\n",
+                                            (void *) frames[allocated], (FRAME_SIZE << order) >> 10);
                                         return "Test failed";
                                 }