Changeset 5f70118 in mainline for kernel/arch/ppc32/src

Timestamp:

2010-01-10T12:16:59Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c77a64f

Parents:

309ede1 (diff), 1ac3a52 (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.

Location:

kernel/arch/ppc32/src

Files:

• debug/stacktrace.c (added)
• debug/stacktrace_asm.S (added)
• mm/as.c (modified) (1 diff)
• mm/page.c (modified) (1 diff)
• mm/tlb.c (modified) (1 diff)
• ppc32.c (modified) (1 diff)

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

@@ -35 +35 @@
 #include <arch/mm/as.h>
 #include <genarch/mm/as_pt.h>
+#include <genarch/mm/page_pt.h>
 #include <genarch/mm/asid_fifo.h>
 #include <arch.h>

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

@@ -51 +51 @@
             KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
                 panic("Unable to map physical memory %p (%" PRIs " bytes).",
-                    physaddr, size)
+                    physaddr, size);
         
         uintptr_t virtaddr = PA2KA(last_frame);

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

@@ -38 +38 @@
 #include <interrupt.h>
 #include <mm/as.h>
+#include <mm/page.h>
 #include <arch.h>
 #include <print.h>

kernel/arch/ppc32/src/ppc32.c

@@ -44 +44 @@
 #include <genarch/ofw/pci.h>
 #include <userspace.h>
+#include <mm/page.h>
 #include <proc/uarg.h>
 #include <console/console.h>