Changeset 46c20c8 in mainline for kernel/test/mm/falloc1.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (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.

File:

• kernel/test/mm/falloc1.c (modified) (3 diffs)

kernel/test/mm/falloc1.c

@@ -33 +33 @@
 #include <mm/slab.h>
 #include <arch/mm/page.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 #include <align.h>
@@ -41 +41 @@
 #define TEST_RUNS   2
 
-char *test_falloc1(void) {
+const char *test_falloc1(void) {
         uintptr_t *frames
             = (uintptr_t *) malloc(MAX_FRAMES * sizeof(uintptr_t), 0);
@@ -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";
                                 }