Changeset e32720ff in mainline for kernel/arch/ia64/src/mm/tlb.c

Timestamp:

2012-11-22T22:20:39Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3f6c16fe

Parents:

0ab362c (diff), 908bb96 (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 from lp:~jakub/helenos/mm.

File:

• kernel/arch/ia64/src/mm/tlb.c (modified) (6 diffs)

kernel/arch/ia64/src/mm/tlb.c

@@ -501 +501 @@
                  * Forward the page fault to address space page fault handler.
                  */
-                if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
-                        fault_if_from_uspace(istate, "Page fault at %p.",
-                            (void *) va);
-                        panic_memtrap(istate, PF_ACCESS_EXEC, va, NULL);
-                }
+                as_page_fault(va, PF_ACCESS_EXEC, istate);
         }
 }
@@ -619 +615 @@
                  * handler.
                  */
-                if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
-                        fault_if_from_uspace(istate, "Page fault at %p.",
-                            (void *) va);
-                        panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, NULL);
-                }
+                as_page_fault(va, PF_ACCESS_READ, istate);
         }
 }
@@ -667 +659 @@
                 dtc_pte_copy(t);
         } else {
-                if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
-                        fault_if_from_uspace(istate, "Page fault at %p.",
-                            (void *) va);
-                        panic_memtrap(istate, PF_ACCESS_WRITE, va, NULL);
-                }
+                as_page_fault(va, PF_ACCESS_WRITE, istate);
         }
 }
@@ -700 +688 @@
                 itc_pte_copy(t);
         } else {
-                if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
-                        fault_if_from_uspace(istate, "Page fault at %p.",
-                            (void *) va);
-                        panic_memtrap(istate, PF_ACCESS_EXEC, va, NULL);
-                }
+                as_page_fault(va, PF_ACCESS_EXEC, istate);
         }
 }
@@ -764 +748 @@
         ASSERT((t) && (t->p));
         ASSERT(!t->w);
-        if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
-                fault_if_from_uspace(istate, "Page fault at %p.",
-                    (void *) va);
-                panic_memtrap(istate, PF_ACCESS_WRITE, va, NULL);
-        }
+        as_page_fault(va, PF_ACCESS_WRITE, istate);
 }
 
@@ -799 +779 @@
                         dtc_pte_copy(t);
         } else {
-                if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
-                        fault_if_from_uspace(istate, "Page fault at %p.",
-                            (void *) va);
-                        panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, NULL);
-                }
+                as_page_fault(va, PF_ACCESS_READ, istate);
         }
 }