Changeset 4dee0cb in mainline

Timestamp:

2012-01-27T21:05:27Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d4673296

Parents:

32817cc

Message:

Fix mips64 build.

Location:

kernel/arch/mips64/src

Files:

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

kernel/arch/mips64/src/mips64.c

@@ -78 +78 @@
         size_t i;
         for (i = 0; i < init.cnt; i++) {
-                init.tasks[i].addr = (uintptr_t) bootinfo->tasks[i].addr;
+                init.tasks[i].paddr = KA2PA(bootinfo->tasks[i].addr);
                 init.tasks[i].size = bootinfo->tasks[i].size;
                 str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN,

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;