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

Timestamp:

2010-12-05T09:34:46Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

75732da

Parents:

56b962d (diff), 35537a7 (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 with development/

File:

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

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

@@ -499 +499 @@
                 page_table_unlock(AS, true);
                 if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
-                        fault_if_from_uspace(istate, "Page fault at %p.", va);
+                        fault_if_from_uspace(istate, "Page fault at %p.",
+                            (void *) va);
                         panic_memtrap(istate, PF_ACCESS_EXEC, va, NULL);
                 }
@@ -556 +557 @@
                         } else {
                                 fault_if_from_uspace(istate,
-                                    "IO access fault at %p.", va);
+                                    "IO access fault at %p.", (void *) va);
                         }
                 }
@@ -620 +621 @@
                  */
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
-                        fault_if_from_uspace(istate, "Page fault at %p.", va);
+                        fault_if_from_uspace(istate, "Page fault at %p.",
+                            (void *) va);
                         panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, NULL);
                 }
@@ -668 +670 @@
         } else {
                 if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
-                        fault_if_from_uspace(istate, "Page fault at %p.", va);
+                        fault_if_from_uspace(istate, "Page fault at %p.",
+                            (void *) va);
                         panic_memtrap(istate, PF_ACCESS_WRITE, va, NULL);
                 }
@@ -704 +707 @@
         } else {
                 if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
-                        fault_if_from_uspace(istate, "Page fault at %p.", va);
+                        fault_if_from_uspace(istate, "Page fault at %p.",
+                            (void *) va);
                         panic_memtrap(istate, PF_ACCESS_EXEC, va, NULL);
                 }
@@ -740 +744 @@
         } else {
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
-                        fault_if_from_uspace(istate, "Page fault at %p.", va);
+                        fault_if_from_uspace(istate, "Page fault at %p.",
+                            (void *) va);
                         panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, NULL);
                 }
@@ -772 +777 @@
         ASSERT(!t->w);
         if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
-                fault_if_from_uspace(istate, "Page fault at %p.", va);
+                fault_if_from_uspace(istate, "Page fault at %p.",
+                    (void *) va);
                 panic_memtrap(istate, PF_ACCESS_WRITE, va, NULL);
         }
@@ -812 +818 @@
                 page_table_unlock(AS, true);
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
-                        fault_if_from_uspace(istate, "Page fault at %p.", va);
+                        fault_if_from_uspace(istate, "Page fault at %p.",
+                            (void *) va);
                         panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, NULL);
                 }