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

Timestamp:

2010-01-20T20:33:55Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

975e7e9

Parents:

6c01702 (diff), 3c081d0e (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

@@ -181 +181 @@
 
         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), "
@@ -186 +187 @@
                     access);
                 
-                fault_if_from_uspace(istate, "Page fault: %#x.", badvaddr);
                 panic("Page fault.");
         }