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

Timestamp:

2009-01-30T16:58:35Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ee79df74

Parents:

12bf33a

Message:

avoid nasty race condition during page fault handling

File:

• kernel/arch/ppc32/src/mm/tlb.c (modified) (3 diffs)

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

@@ -112 +112 @@
         char *sym2 = "";
 
-        char *s = get_symtab_entry(istate->pc);
-        if (s)
-                symbol = s;
-        s = get_symtab_entry(istate->lr);
-        if (s)
-                sym2 = s;
+        char *str = get_symtab_entry(istate->pc);
+        if (str)
+                symbol = str;
+        str = get_symtab_entry(istate->lr);
+        if (str)
+                sym2 = str;
 
         fault_if_from_uspace(istate,
-            "%p: PHT Refill Exception at %p (%s<-%s).", badvaddr,
-            istate->pc, symbol, sym2);
+            "PHT Refill Exception on %p.", badvaddr);
         panic("%p: PHT Refill Exception at %p (%s<-%s).", badvaddr,
             istate->pc, symbol, sym2);
@@ -292 +291 @@
         }
         
-        if (n == VECTOR_DATA_STORAGE) {
-                asm volatile (
-                        "mfdar %0\n"
-                        : "=r" (badvaddr)
-                );
-        } else
+        if (n == VECTOR_DATA_STORAGE)
+                badvaddr = istate->dar;
+        else
                 badvaddr = istate->pc;
                 
@@ -343 +339 @@
         uintptr_t badvaddr;
         
-        if (n == VECTOR_DATA_STORAGE) {
-                asm volatile (
-                        "mfdar %0\n"
-                        : "=r" (badvaddr)
-                );
-        } else
+        if (n == VECTOR_DATA_STORAGE)
+                badvaddr = istate->dar;
+        else
                 badvaddr = istate->pc;