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

Timestamp:

2010-03-13T12:17:02Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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

@@ -114 +114 @@
 static void pht_refill_fail(uintptr_t badvaddr, istate_t *istate)
 {
-        char *symbol;
-        char *sym2;
-
-        symbol = symtab_fmt_name_lookup(istate->pc);
-        sym2 = symtab_fmt_name_lookup(istate->lr);
-
+        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);