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

Timestamp:

2012-11-25T21:34:07Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

e1a27be

Parents:

150a271 (diff), 7462674 (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

@@ -289 +289 @@
 #error "Unsupported architecture"
 #endif
-        const int ret = as_page_fault(badvaddr, access, istate);
-
-        if (ret == AS_PF_FAULT) {
-                fault_if_from_uspace(istate, "Page fault: %#x.", badvaddr);
-                panic_memtrap(istate, access, badvaddr, NULL);
-        }
+        as_page_fault(badvaddr, access, istate);
 }
 
@@ -305 +300 @@
 void prefetch_abort(unsigned int exc_no, istate_t *istate)
 {
-        /* NOTE: We should use IFAR and IFSR here. */
-        int ret = as_page_fault(istate->pc, PF_ACCESS_EXEC, istate);
-
-        if (ret == AS_PF_FAULT) {
-                fault_if_from_uspace(istate,
-                    "Page fault - prefetch_abort: %#x.", istate->pc);
-                panic_memtrap(istate, PF_ACCESS_EXEC, istate->pc, NULL);
-        }
+        as_page_fault(istate->pc, PF_ACCESS_EXEC, istate);
 }