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

Timestamp:

2011-03-30T13:10:24Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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) (1 diff)

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

@@ -557 +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();