Changeset 6843a9c in mainline for kernel/arch/ppc32/src/mm/page.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

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

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

@@ -46 +46 @@
 }
 
-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 (%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);
-        
-        return virtaddr;
-}
-
 /** @}
  */