Changeset 1dbc43f in mainline for kernel/generic/src/mm/as.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/generic/src/mm/as.c (modified) (3 diffs)

kernel/generic/src/mm/as.c

@@ -79 +79 @@
 #include <syscall/copy.h>
 #include <arch/interrupt.h>
+#include <interrupt.h>
 
 /**
@@ -1363 +1364 @@
 {
         if (!THREAD)
-                return AS_PF_FAULT;
+                goto page_fault;
         
         if (!AS)
-                return AS_PF_FAULT;
+                goto page_fault;
         
         mutex_lock(&AS->lock);
@@ -1444 +1445 @@
                     (uintptr_t) &memcpy_to_uspace_failover_address);
         } else {
-                return AS_PF_FAULT;
+                fault_if_from_uspace(istate, "Page fault: %p.", (void *) page);
+                panic_memtrap(istate, access, page, NULL);
         }