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

Timestamp:

2010-03-13T12:17:02Z (14 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/mips32/src/mm/tlb.c (modified) (3 diffs)

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

@@ -321 +321 @@
 void tlb_refill_fail(istate_t *istate)
 {
-        char *symbol, *sym2;
-
-        symbol = symtab_fmt_name_lookup(istate->epc);
-        sym2 = symtab_fmt_name_lookup(istate->ra);
+        const char *symbol = symtab_fmt_name_lookup(istate->epc);
+        const char *sym2 = symtab_fmt_name_lookup(istate->ra);
         
         fault_if_from_uspace(istate, "TLB Refill Exception on %p.",
@@ -335 +333 @@
 void tlb_invalid_fail(istate_t *istate)
 {
-        char *symbol;
-
-        symbol = symtab_fmt_name_lookup(istate->epc);
-
+        const char *symbol = symtab_fmt_name_lookup(istate->epc);
+        
         fault_if_from_uspace(istate, "TLB Invalid Exception on %p.",
             cp0_badvaddr_read());
@@ -347 +343 @@
 void tlb_modified_fail(istate_t *istate)
 {
-        char *symbol;
-
-        symbol = symtab_fmt_name_lookup(istate->epc);
-
+        const char *symbol = symtab_fmt_name_lookup(istate->epc);
+        
         fault_if_from_uspace(istate, "TLB Modified Exception on %p.",
             cp0_badvaddr_read());