Changeset bd48f4c in mainline for kernel/arch/ppc32/src/mm/tlb.c

Timestamp:

2010-07-12T10:53:30Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd11d3e

Parents:

c40e6ef (diff), bee2d4c (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/ppc32/src/mm/tlb.c (modified) (1 diff)

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

@@ -111 +111 @@
 static void pht_refill_fail(uintptr_t badvaddr, istate_t *istate)
 {
-        const char *symbol = symtab_fmt_name_lookup(istate->pc);
-        const char *sym2 = symtab_fmt_name_lookup(istate->lr);
-        
-        fault_if_from_uspace(istate,
-            "PHT Refill Exception on %p.", badvaddr);
-        panic("%p: PHT Refill Exception at %p (%s<-%s).", badvaddr,
-            istate->pc, symbol, sym2);
+        fault_if_from_uspace(istate, "PHT Refill Exception on %p.", badvaddr);
+        panic_memtrap(istate, PF_ACCESS_READ, badvaddr,
+            "PHT Refill Exception.");
 }