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

Timestamp:

2011-02-11T12:41:11Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

d81ef61c

Parents:

78d1525 (diff), 5d4193c (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 from usb/development

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();