Changeset cd3b380 in mainline for kernel/test/mm/falloc2.c

Timestamp:

2013-09-11T11:56:39Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1db5669

Parents:

43dd8028

Message:

due to the removal of FRAME_KA, the return value of frame_alloc*() needs to be checked before converting the physical address to kernel address

File:

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

kernel/test/mm/falloc2.c

@@ -74 +74 @@
                         unsigned int allocated = 0;
                         for (unsigned int i = 0; i < (MAX_FRAMES / count); i++) {
-                                frames[allocated] =
-                                    PA2KA(frame_alloc(count, FRAME_ATOMIC, 0));
+                                frames[allocated] = frame_alloc(count, FRAME_ATOMIC, 0);
                                 if (frames[allocated]) {
-                                        memsetb((void *) frames[allocated], bytes, val);
+                                        memsetb((void *) PA2KA(frames[allocated]), bytes, val);
                                         allocated++;
                                 } else
@@ -91 +90 @@
                         for (unsigned int i = 0; i < allocated; i++) {
                                 for (size_t k = 0; k < bytes; k++) {
-                                        if (((uint8_t *) frames[i])[k] != val) {
+                                        if (((uint8_t *) PA2KA(frames[i]))[k] != val) {
                                                 TPRINTF("Thread #%" PRIu64 " (cpu%u): "
                                                     "Unexpected data (%c) in block %zu offset %zu\n",
-                                                    THREAD->tid, CPU->id, ((char *) frames[i])[k],
+                                                    THREAD->tid, CPU->id, ((char *) PA2KA(frames[i]))[k],
                                                     frames[i], k);
                                                 atomic_inc(&thread_fail);
@@ -100 +99 @@
                                         }
                                 }
-                                frame_free(KA2PA(frames[i]), count);
+                                frame_free(frames[i], count);
                         }