Changeset fe56c08a in mainline for kernel/arch/mips64/src/mm/frame.c

Timestamp:

2012-01-28T09:17:24Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

ca3d77a

Parents:

8da2c60 (diff), 9970a5a (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 with mainline

File:

• kernel/arch/mips64/src/mm/frame.c (modified) (1 diff)

kernel/arch/mips64/src/mm/frame.c

@@ -115 +115 @@
         for (i = 0; i < init.cnt; i++)
                 if (overlaps(frame << ZERO_PAGE_WIDTH, ZERO_PAGE_SIZE,
-                    KA2PA(init.tasks[i].addr), init.tasks[i].size)) {
+                    init.tasks[i].paddr, init.tasks[i].size)) {
                         safe = false;
                         break;