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

Timestamp:

2010-07-12T16:45:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6b1a85c

Parents:

bee2d4c (diff), 8078180 (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/upa

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_memtrap(istate, PF_ACCESS_EXEC, va,
-                            "Page fault.");
+                        panic_memtrap(istate, PF_ACCESS_EXEC, va, NULL);
                 }
         }
@@ -622 +621 @@
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate, "Page fault at %p.", va);
-                        panic_memtrap(istate, PF_ACCESS_READ, va,
-                            "Page fault.");
+                        panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, NULL);
                 }
         }
@@ -671 +669 @@
                 if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate, "Page fault at %p.", va);
-                        panic_memtrap(istate, PF_ACCESS_WRITE, va,
-                            "Page fault.");
+                        panic_memtrap(istate, PF_ACCESS_WRITE, va, NULL);
                 }
         }
@@ -708 +705 @@
                 if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate, "Page fault at %p.", va);
-                        panic_memtrap(istate, PF_ACCESS_EXEC, va,
-                            "Page fault.");
+                        panic_memtrap(istate, PF_ACCESS_EXEC, va, NULL);
                 }
         }
@@ -745 +741 @@
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate, "Page fault at %p.", va);
-                        panic_memtrap(istate, PF_ACCESS_READ, va,
-                            "Page fault.");
+                        panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, NULL);
                 }
         }
@@ -778 +773 @@
         if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
                 fault_if_from_uspace(istate, "Page fault at %p.", va);
-                panic_memtrap(istate, PF_ACCESS_WRITE, va, "Page fault.");
+                panic_memtrap(istate, PF_ACCESS_WRITE, va, NULL);
         }
         page_table_unlock(AS, true);
@@ -818 +813 @@
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate, "Page fault at %p.", va);
-                        panic_memtrap(istate, PF_ACCESS_READ, va,
-                            "Page fault.");
+                        panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, NULL);
                 }
         }