Changeset 46c20c8 in mainline for kernel/arch/ppc32/src/mm/page.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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 mainline changes.

File:

• kernel/arch/ppc32/src/mm/page.c (modified) (1 diff)

kernel/arch/ppc32/src/mm/page.c

@@ -45 +45 @@
 }
 
-
 uintptr_t hw_map(uintptr_t physaddr, size_t size)
 {
         if (last_frame + ALIGN_UP(size, PAGE_SIZE) >
             KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
-                panic("Unable to map physical memory %p (%" PRIs " bytes).",
-                    physaddr, size);
+                panic("Unable to map physical memory %p (%zu bytes).",
+                    (void *) physaddr, size);
         
         uintptr_t virtaddr = PA2KA(last_frame);
         pfn_t i;
+        page_table_lock(AS_KERNEL, true);
         for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++)
                 page_mapping_insert(AS_KERNEL, virtaddr + PFN2ADDR(i),
                     physaddr + PFN2ADDR(i), PAGE_NOT_CACHEABLE | PAGE_WRITE);
+        page_table_unlock(AS_KERNEL, true);
         
         last_frame = ALIGN_UP(last_frame + size, FRAME_SIZE);