Changeset 5f83634 in mainline for kernel/arch/sparc64

Timestamp:

2010-07-12T16:45:05Z (16 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

Location:

kernel/arch/sparc64/src/mm

Files:

• sun4u/tlb.c (modified) (4 diffs)
• sun4v/tlb.c (modified) (3 diffs)

kernel/arch/sparc64/src/mm/sun4u/tlb.c

@@ -259 +259 @@
                         /* NULL access in kernel */
                         do_fast_data_access_mmu_miss_fault(istate, tag,
-                            "Dereferencing NULL pointer");
+                            "Dereferencing NULL pointer.");
                 } else if (page_8k >= end_of_identity) {
                         /*
@@ -442 +442 @@
 {
         fault_if_from_uspace(istate, "%s, Address=%p.", str, va);
-        panic_memtrap(istate, PF_ACCESS_EXEC, va, "%s.", str);
+        panic_memtrap(istate, PF_ACCESS_EXEC, va, str);
 }
 
@@ -453 +453 @@
         fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str, va,
             tag.context);
-        panic_memtrap(istate, PF_ACCESS_READ, va, "%s.", str);
+        panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, str);
 }
 
@@ -464 +464 @@
         fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str, va,
             tag.context);
-        panic_memtrap(istate, PF_ACCESS_WRITE, va, "%s.", str);
+        panic_memtrap(istate, PF_ACCESS_WRITE, va, str);
 }
 

kernel/arch/sparc64/src/mm/sun4v/tlb.c

@@ -359 +359 @@
 {
         fault_if_from_uspace(istate, "%s, Address=%p.", str, va);
-        panic_memtrap(istate, PF_ACCESS_EXEC, va, "%s.", str);
+        panic_memtrap(istate, PF_ACCESS_EXEC, va, str);
 }
 
@@ -367 +367 @@
         fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str,
             DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
-        panic_memtrap(istate, PF_ACCESS_READ, DMISS_ADDRESS(page_and_ctx),
-            "%s.");
+        panic_memtrap(istate, PF_ACCESS_UNKNOWN, DMISS_ADDRESS(page_and_ctx),
+            str);
 }
 
@@ -377 +377 @@
             DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
         panic_memtrap(istate, PF_ACCESS_WRITE, DMISS_ADDRESS(page_and_ctx),
-            "%s.");
+            str);
 }