Changeset 404be7c in mainline

Timestamp:

2011-12-10T00:04:59Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d8f1545

Parents:

7c3e482

Message:

Fix hw_map() by using the new km_alloc_page() interface.

File:

• kernel/generic/src/mm/page.c (modified) (2 diffs)

kernel/generic/src/mm/page.c

@@ -65 +65 @@
 #include <arch/mm/asid.h>
 #include <mm/as.h>
+#include <mm/km.h>
 #include <mm/frame.h>
 #include <arch/barrier.h>
@@ -179 +180 @@
 uintptr_t hw_map(uintptr_t physaddr, size_t size)
 {
-        uintptr_t virtaddr = (uintptr_t) NULL;  // FIXME
+        uintptr_t virtaddr;
+        size_t asize;
         pfn_t i;
 
+        asize = ALIGN_UP(size, PAGE_SIZE);
+        virtaddr = km_page_alloc(asize, PAGE_SIZE);
+
         page_table_lock(AS_KERNEL, true);
-        for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++) {
+        for (i = 0; i < ADDR2PFN(asize); i++) {
                 uintptr_t addr = PFN2ADDR(i);
                 page_mapping_insert(AS_KERNEL, virtaddr + addr, physaddr + addr,