Changeset 6843a9c in mainline for kernel/arch/mips32/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/mips32/src/mm/page.c (modified) (1 diff)

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

@@ -41 +41 @@
 {
         page_mapping_operations = &pt_mapping_operations;
-}
-
-/** Map device into kernel space
- * - on mips, all devices are already mapped into kernel space,
- *   translate the physical address to uncached area
- */
-uintptr_t hw_map(uintptr_t physaddr, size_t size)
-{
-        return physaddr + 0xa0000000;
+        as_switch(NULL, AS_KERNEL);
 }