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

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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) (4 diffs)

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

@@ -323 +323 @@
         uintptr_t va = cp0_badvaddr_read();
         
-        fault_if_from_uspace(istate, "TLB Refill Exception on %p.", va);
+        fault_if_from_uspace(istate, "TLB Refill Exception on %p.",
+            (void *) va);
         panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, "TLB Refill Exception.");
 }
@@ -332 +333 @@
         uintptr_t va = cp0_badvaddr_read();
         
-        fault_if_from_uspace(istate, "TLB Invalid Exception on %p.", va);
+        fault_if_from_uspace(istate, "TLB Invalid Exception on %p.",
+            (void *) va);
         panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, "TLB Invalid Exception.");
 }
@@ -340 +342 @@
         uintptr_t va = cp0_badvaddr_read();
         
-        fault_if_from_uspace(istate, "TLB Modified Exception on %p.", va);
+        fault_if_from_uspace(istate, "TLB Modified Exception on %p.",
+            (void *) va);
         panic_memtrap(istate, PF_ACCESS_WRITE, va, "TLB Modified Exception.");
 }
@@ -554 +557 @@
         entry_hi_t hi, hi_save;
         tlb_index_t index;
-
-        ASSERT(asid != ASID_INVALID);
+        
+        if (asid == ASID_INVALID)
+                return;
 
         hi_save.value = cp0_entry_hi_read();