Changeset bd48f4c in mainline for kernel/arch/arm32/src/mm/page_fault.c

Timestamp:

2010-07-12T10:53:30Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd11d3e

Parents:

c40e6ef (diff), bee2d4c (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/arm32/src/mm/page_fault.c (modified) (2 diffs)

kernel/arch/arm32/src/mm/page_fault.c

@@ -183 +183 @@
         if (ret == AS_PF_FAULT) {
                 fault_if_from_uspace(istate, "Page fault: %#x.", badvaddr);
-                print_istate(istate);
-                printf("page fault - pc: %x, va: %x, status: %x(%x), "
-                    "access:%d\n", istate->pc, badvaddr, fsr.status, fsr,
-                    access);
-                
-                panic("Page fault.");
+                panic_memtrap(istate, access, badvaddr, "Page fault.");
         }
 }
@@ -203 +198 @@
 
         if (ret == AS_PF_FAULT) {
-                printf("prefetch_abort\n");
-                print_istate(istate);
-                panic("page fault - prefetch_abort at address: %x.",
-                    istate->pc);
+                panic_memtrap(istate, PF_ACCESS_EXEC, istate->pc,
+                    "Page fault - prefetch_abort.");
         }
 }