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

Timestamp:

2010-07-12T10:53:30Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd11d3e

Parents:

c40e6ef (diff), bee2d4c (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/ia64/src/mm/tlb.c (modified) (7 diffs)

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

@@ -500 +500 @@
                 if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate, "Page fault at %p.", va);
-                        panic("%s: va=%p, rid=%d, iip=%p.", __func__, va, rid,
-                            istate->cr_iip);
+                        panic_memtrap(istate, PF_ACCESS_EXEC, va,
+                            "Page fault.");
                 }
         }
@@ -622 +622 @@
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate, "Page fault at %p.", va);
-                        panic("%s: va=%p, rid=%d, iip=%p.", __func__, va, rid,
-                            istate->cr_iip);
+                        panic_memtrap(istate, PF_ACCESS_READ, va,
+                            "Page fault.");
                 }
         }
@@ -671 +671 @@
                 if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate, "Page fault at %p.", va);
-                        panic("%s: va=%p, rid=%d, iip=%p.", __func__, va, rid,
-                            istate->cr_iip);
+                        panic_memtrap(istate, PF_ACCESS_WRITE, va,
+                            "Page fault.");
                 }
         }
@@ -708 +708 @@
                 if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate, "Page fault at %p.", va);
-                        panic("%s: va=%p, rid=%d, iip=%p.", __func__, va, rid,
-                            istate->cr_iip);
+                        panic_memtrap(istate, PF_ACCESS_EXEC, va,
+                            "Page fault.");
                 }
         }
@@ -745 +745 @@
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate, "Page fault at %p.", va);
-                        panic("%s: va=%p, rid=%d, iip=%p.", __func__, va, rid,
-                            istate->cr_iip);
+                        panic_memtrap(istate, PF_ACCESS_READ, va,
+                            "Page fault.");
                 }
         }
@@ -778 +778 @@
         if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
                 fault_if_from_uspace(istate, "Page fault at %p.", va);
-                panic("%s: va=%p, rid=%d, iip=%p.", __func__, va, rid,
-                    istate->cr_iip);
+                panic_memtrap(istate, PF_ACCESS_WRITE, va, "Page fault.");
         }
         page_table_unlock(AS, true);
@@ -819 +818 @@
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate, "Page fault at %p.", va);
-                        panic("%s: va=%p, rid=%d.", __func__, va, rid);
+                        panic_memtrap(istate, PF_ACCESS_READ, va,
+                            "Page fault.");
                 }
         }