Fork us on GitHub Follow us on Facebook Follow us on Twitter

Ignore:
Timestamp:
2010-12-05T09:34:46Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
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:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/sparc64/src/mm/sun4v/tlb.c

    r56b962d r84439d7  
    358358    const char *str)
    359359{
    360         fault_if_from_uspace(istate, "%s, Address=%p.", str, va);
     360        fault_if_from_uspace(istate, "%s, address=%p.", str,
     361            (void *) va);
    361362        panic_memtrap(istate, PF_ACCESS_EXEC, va, str);
    362363}
     
    365366    uint64_t page_and_ctx, const char *str)
    366367{
    367         fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str,
    368             DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
     368        fault_if_from_uspace(istate, "%s, page=%p (asid=%" PRId64 ").", str,
     369            (void *) DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
    369370        panic_memtrap(istate, PF_ACCESS_UNKNOWN, DMISS_ADDRESS(page_and_ctx),
    370371            str);
     
    374375    uint64_t page_and_ctx, const char *str)
    375376{
    376         fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str,
    377             DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
     377        fault_if_from_uspace(istate, "%s, page=%p (asid=%" PRId64 ").", str,
     378            (void *) DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
    378379        panic_memtrap(istate, PF_ACCESS_WRITE, DMISS_ADDRESS(page_and_ctx),
    379380            str);
     
    399400        uint64_t errno =  __hypercall_fast3(MMU_DEMAP_ALL, 0, 0,
    400401                MMU_FLAG_DTLB | MMU_FLAG_ITLB);
    401         if (errno != HV_EOK) {
    402                 panic("Error code = %d.\n", errno);
    403         }
     402        if (errno != HV_EOK)
     403                panic("Error code = %" PRIu64 ".\n", errno);
    404404}
    405405
Note: See TracChangeset for help on using the changeset viewer.