Changeset 32817cc in mainline for kernel/generic/src/mm

Timestamp:

2012-01-25T22:59:35Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4dee0cb

Parents:

7943c43

Message:

Make the kernel ready for init tasks loaded to high memory.

Location:

kernel/generic/src/mm

Files:

• backend_elf.c (modified) (1 diff)
• frame.c (modified) (2 diffs)

kernel/generic/src/mm/backend_elf.c

@@ -318 +318 @@
                         dirty = true;
                 } else {
-                        frame = KA2PA(base + i * FRAME_SIZE);
+                        pte_t *pte = page_mapping_find(AS_KERNEL,
+                            base + i * FRAME_SIZE, true);
+
+                        ASSERT(pte);
+                        ASSERT(PTE_PRESENT(pte));
+
+                        frame = PTE_GET_FRAME(pte);
                 }       
         } else if (upage >= start_anon) {

kernel/generic/src/mm/frame.c

@@ -924 +924 @@
                                 for (i = 0; i < init.cnt; i++)
                                         if (overlaps(addr, PFN2ADDR(confcount),
-                                            KA2PA(init.tasks[i].addr),
+                                            init.tasks[i].paddr,
                                             init.tasks[i].size)) {
                                                 overlap = true;
@@ -1251 +1251 @@
                 size_t i;
                 for (i = 0; i < init.cnt; i++) {
-                        pfn_t pfn = ADDR2PFN(KA2PA(init.tasks[i].addr));
+                        pfn_t pfn = ADDR2PFN(init.tasks[i].paddr);
                         frame_mark_unavailable(pfn,
                             SIZE2FRAMES(init.tasks[i].size));