projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[linux-2.6-block.git]
/
arch
/
mips
/
mm
/
tlb-r8k.c
diff --git
a/arch/mips/mm/tlb-r8k.c
b/arch/mips/mm/tlb-r8k.c
index 91c2499f806a25809259a0b9682667ce2d7f31d5..122f9207f49e7f58871cda1bb681f73370fd1286 100644
(file)
--- a/
arch/mips/mm/tlb-r8k.c
+++ b/
arch/mips/mm/tlb-r8k.c
@@
-195,7
+195,7
@@
void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte)
if (current->active_mm != vma->vm_mm)
return;
- pid =
read_c0_entryhi() & ASID_MASK
;
+ pid =
ASID_MASK(read_c0_entryhi())
;
local_irq_save(flags);
address &= PAGE_MASK;