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

Timestamp:

2012-11-22T21:23:47Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

908bb96

Parents:

34ae0a5

Message:

Unify user page fault handling in as_page_fault().

• Remove lots of architecture-dependent boilerplate code.

File:

• kernel/arch/arm32/src/mm/page_fault.c (modified) (2 diffs)

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

@@ -151 +151 @@
         pf_access_t access = get_memory_access_type(istate->pc, badvaddr);
 
-        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);
 }
 
@@ -167 +162 @@
 void prefetch_abort(unsigned int exc_no, istate_t *istate)
 {
-        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);
 }