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

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• kernel/arch/mips32/src/mm/tlb.c (modified) (1 diff)

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

@@ -95 +95 @@
         
         badvaddr = cp0_badvaddr_read();
-        
-        mutex_lock(&AS->lock);
         asid = AS->asid;
-        mutex_unlock(&AS->lock);
         
         pte = find_mapping_and_check(badvaddr, PF_ACCESS_READ, istate, &pfrc);