Changeset 074c9bd in mainline for kernel/arch/sparc64/src/mm/sun4v/tlb.c

Timestamp:

2010-07-15T10:39:23Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5c16ce7

Parents:

41ce4d9 (diff), 4003861 (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/sparc64/src/mm/sun4v/tlb.c (modified) (3 diffs)

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);
 }