diff options
| author | Ralf Baechle | 2013-05-09 17:57:30 +0200 |
|---|---|---|
| committer | Ralf Baechle | 2013-05-09 17:57:30 +0200 |
| commit | b22d1b6a91ca4260f869e349179ae53f18c664db (patch) | |
| tree | 6ac6c2bd202100727638f02ae5037ec78144e8d5 /arch/mips/mm/tlb-r4k.c | |
| parent | Merge branch 'next/kvm' into mips-for-linux-next (diff) | |
| parent | MIPS: Add new GIC clockevent driver. (diff) | |
| download | kernel-qcow2-linux-b22d1b6a91ca4260f869e349179ae53f18c664db.tar.gz kernel-qcow2-linux-b22d1b6a91ca4260f869e349179ae53f18c664db.tar.xz kernel-qcow2-linux-b22d1b6a91ca4260f869e349179ae53f18c664db.zip | |
Merge branch 'mti-next' of git://git.linux-mips.org/pub/scm/sjhill/linux-sjhill into mips-for-linux-next
Diffstat (limited to 'arch/mips/mm/tlb-r4k.c')
| -rw-r--r-- | arch/mips/mm/tlb-r4k.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c index c643de4c473a..09653b290d53 100644 --- a/arch/mips/mm/tlb-r4k.c +++ b/arch/mips/mm/tlb-r4k.c @@ -287,7 +287,7 @@ void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte) ENTER_CRITICAL(flags); - pid = read_c0_entryhi() & ASID_MASK; + pid = ASID_MASK(read_c0_entryhi()); address &= (PAGE_MASK << 1); write_c0_entryhi(address | pid); pgdp = pgd_offset(vma->vm_mm, address); |