Changeset 221c9ec in mainline for kernel/generic/src/main/kinit.c

Timestamp:

2012-01-27T23:01:00Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9970a5a, babb57e

Parents:

1ccd0aa

Message:

Use km_map() in kinit().

File:

• kernel/generic/src/main/kinit.c (modified) (2 diffs)

kernel/generic/src/main/kinit.c

@@ -205 +205 @@
                  * Create virtual memory mappings for init task images.
                  */
-                size_t size = ALIGN_UP(init.tasks[i].size, PAGE_SIZE);
-                size_t offs;
-                uintptr_t page = km_page_alloc(size, PAGE_SIZE);
-                uintptr_t frame = init.tasks[i].paddr;
-
-                page_table_lock(AS_KERNEL, true);
-                for (offs = 0; offs < size; offs += PAGE_SIZE) {
-                        page_mapping_insert(AS_KERNEL, page + offs,
-                            frame + offs,
-                            PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE |
-                            PAGE_PRESENT);
-                }
-                page_table_unlock(AS_KERNEL, true);
+                uintptr_t page = km_map(init.tasks[i].paddr,
+                    init.tasks[i].size,
+                    PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE);
+                ASSERT(page);
                 
                 int rc = program_create_from_image((void *) page, namebuf,
@@ -243 +234 @@
                          * Assume the last task is the RAM disk.
                          */
-                        init_rd((void *) frame, init.tasks[i].size);
+                        init_rd((void *) init.tasks[i].paddr, init.tasks[i].size);
                 } else
                         printf("init[%zu]: Init binary load failed (error %d)\n", i, rc);