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

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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) (5 diffs)

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

@@ -213 +213 @@
 
 /** ITLB miss handler. */
-void fast_instruction_access_mmu_miss(unative_t unused, istate_t *istate)
+void fast_instruction_access_mmu_miss(sysarg_t unused, istate_t *istate)
 {
         uintptr_t va = ALIGN_DOWN(istate->tpc, PAGE_SIZE);
@@ -358 +358 @@
     const char *str)
 {
-        fault_if_from_uspace(istate, "%s, Address=%p.", str, va);
+        fault_if_from_uspace(istate, "%s, address=%p.", str,
+            (void *) va);
         panic_memtrap(istate, PF_ACCESS_EXEC, va, str);
 }
@@ -365 +366 @@
     uint64_t page_and_ctx, const char *str)
 {
-        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str,
-            DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
+        fault_if_from_uspace(istate, "%s, page=%p (asid=%" PRId64 ").", str,
+            (void *) DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
         panic_memtrap(istate, PF_ACCESS_UNKNOWN, DMISS_ADDRESS(page_and_ctx),
             str);
@@ -374 +375 @@
     uint64_t page_and_ctx, const char *str)
 {
-        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str,
-            DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
+        fault_if_from_uspace(istate, "%s, page=%p (asid=%" PRId64 ").", str,
+            (void *) DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
         panic_memtrap(istate, PF_ACCESS_WRITE, DMISS_ADDRESS(page_and_ctx),
             str);
@@ -399 +400 @@
         uint64_t errno =  __hypercall_fast3(MMU_DEMAP_ALL, 0, 0,
                 MMU_FLAG_DTLB | MMU_FLAG_ITLB);
-        if (errno != HV_EOK) {
-                panic("Error code = %d.\n", errno);
-        }
+        if (errno != HV_EOK)
+                panic("Error code = %" PRIu64 ".\n", errno);
 }