[src/trunk]: src/sys/arch/mips/mips Use pmap_tlb_asid_check to reduce code c&p.

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/71071cca1fca
branches:  trunk
changeset: 795822:71071cca1fca
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat May 03 12:50:01 2014 +0000

description:
Use pmap_tlb_asid_check to reduce code c&p.

diffstat:

 sys/arch/mips/mips/pmap.c |  24 ++++--------------------
 1 files changed, 4 insertions(+), 20 deletions(-)

diffs (52 lines):

diff -r bf92a7ed29a4 -r 71071cca1fca sys/arch/mips/mips/pmap.c
--- a/sys/arch/mips/mips/pmap.c Sat May 03 11:17:06 2014 +0000
+++ b/sys/arch/mips/mips/pmap.c Sat May 03 12:50:01 2014 +0000
@@ -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 @@
        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 @@
        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