Changeset 074c9bd in mainline for kernel/arch/arm32/src

Timestamp:

2010-07-15T10:39:23Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5c16ce7

Parents:

41ce4d9 (diff), 4003861 (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);
-                panic_memtrap(istate, access, badvaddr, "Page fault.");
+                panic_memtrap(istate, access, badvaddr, NULL);
         }
 }
@@ -198 +198 @@
 
         if (ret == AS_PF_FAULT) {
-                panic_memtrap(istate, PF_ACCESS_EXEC, istate->pc,
-                    "Page fault - prefetch_abort.");
+                fault_if_from_uspace(istate,
+                    "Page fault - prefetch_abort: %#x.", istate->pc);
+                panic_memtrap(istate, PF_ACCESS_EXEC, istate->pc, NULL);
         }
 }