[src/trunk]: src/sys/arch/x86 drop pmap_update_2pg(), just call pmap_update_p...

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

details:   https://anonhg.NetBSD.org/src/rev/ba402e372f70
branches:  trunk
changeset: 360002:ba402e372f70
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sun Mar 04 10:13:08 2018 +0000

description:
drop pmap_update_2pg(), just call pmap_update_pg() separately for each

diffstat:

 sys/arch/x86/include/pmap.h |  13 +------------
 sys/arch/x86/x86/pmap.c     |   7 ++++---
 2 files changed, 5 insertions(+), 15 deletions(-)

diffs (55 lines):

diff -r b5e9f9bbbed6 -r ba402e372f70 sys/arch/x86/include/pmap.h
--- a/sys/arch/x86/include/pmap.h       Sun Mar 04 10:02:10 2018 +0000
+++ b/sys/arch/x86/include/pmap.h       Sun Mar 04 10:13:08 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.75 2018/01/18 07:25:34 maxv Exp $   */
+/*     $NetBSD: pmap.h,v 1.76 2018/03/04 10:13:08 jdolecek Exp $       */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -398,17 +398,6 @@
 }
 
 /*
- * pmap_update_2pg: flush two pages from the TLB
- */
-
-__inline static void __unused
-pmap_update_2pg(vaddr_t va, vaddr_t vb)
-{
-       invlpg(va);
-       invlpg(vb);
-}
-
-/*
  * pmap_page_protect: change the protection of all recorded mappings
  *     of a managed page
  *
diff -r b5e9f9bbbed6 -r ba402e372f70 sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Sun Mar 04 10:02:10 2018 +0000
+++ b/sys/arch/x86/x86/pmap.c   Sun Mar 04 10:13:08 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.282 2018/03/01 16:55:01 maxv Exp $  */
+/*     $NetBSD: pmap.c,v 1.283 2018/03/04 10:13:09 jdolecek Exp $      */
 
 /*
  * Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc.
@@ -170,7 +170,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.282 2018/03/01 16:55:01 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.283 2018/03/04 10:13:09 jdolecek Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -3388,7 +3388,8 @@
        pmap_pte_set(srcpte, pmap_pa2pte(srcpa) | pteflags);
        pmap_pte_set(dstpte, pmap_pa2pte(dstpa) | pteflags | PG_M);
        pmap_pte_flush();
-       pmap_update_2pg(srcva, dstva);
+       pmap_update_pg(srcva);
+       pmap_update_pg(dstva);
 
        memcpy((void *)dstva, (void *)srcva, PAGE_SIZE);