Module Name: src
Committed By: skrll
Date: Sat May 3 12:50:02 UTC 2014
Modified Files:
src/sys/arch/mips/mips: pmap.c
Log Message:
Use pmap_tlb_asid_check to reduce code c&p.
To generate a diff of this commit:
cvs rdiff -u -r1.212 -r1.213 src/sys/arch/mips/mips/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/pmap.c
diff -u src/sys/arch/mips/mips/pmap.c:1.212 src/sys/arch/mips/mips/pmap.c:1.213
--- src/sys/arch/mips/mips/pmap.c:1.212 Sat May 3 07:06:31 2014
+++ src/sys/arch/mips/mips/pmap.c Sat May 3 12:50:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.212 2014/05/03 07:06:31 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.213 2014/05/03 12:50:01 skrll Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.212 2014/05/03 07:06:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.213 2014/05/03 12:50:01 skrll Exp $");
/*
* Manages physical address maps.
@@ -1025,15 +1025,7 @@ pmap_remove(pmap_t pmap, vaddr_t sva, va
if (eva > VM_MAXUSER_ADDRESS)
panic("pmap_remove: uva not in range");
if (PMAP_IS_ACTIVE(pmap)) {
- struct pmap_asid_info * const pai = PMAP_PAI(pmap, curcpu());
- uint32_t asid;
-
- __asm volatile("mfc0 %0,$10; nop" : "=r"(asid));
- asid = (MIPS_HAS_R4K_MMU) ? (asid & 0xff) : (asid & 0xfc0) >> 6;
- if (asid != pai->pai_asid) {
- panic("inconsistency for active TLB flush: %d <-> %d",
- asid, pai->pai_asid);
- }
+ pmap_tlb_asid_check();
}
#endif
#ifdef PMAP_FAULTINFO
@@ -1216,15 +1208,7 @@ pmap_protect(pmap_t pmap, vaddr_t sva, v
if (eva > VM_MAXUSER_ADDRESS)
panic("pmap_protect: uva not in range");
if (PMAP_IS_ACTIVE(pmap)) {
- struct pmap_asid_info * const pai = PMAP_PAI(pmap, curcpu());
- uint32_t asid;
-
- __asm volatile("mfc0 %0,$10; nop" : "=r"(asid));
- asid = (MIPS_HAS_R4K_MMU) ? (asid & 0xff) : (asid & 0xfc0) >> 6;
- if (asid != pai->pai_asid) {
- panic("inconsistency for active TLB update: %d <-> %d",
- asid, pai->pai_asid);
- }
+ pmap_tlb_asid_check();
}
#endif
